diff --git a/django/conf/urls/shortcut.py b/django/conf/urls/shortcut.py
index f0ed9d9fd0..135f3be840 100644
--- a/django/conf/urls/shortcut.py
+++ b/django/conf/urls/shortcut.py
@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('django.views',
-    (r'^(?P<content_type_id>\d+)/(?P<object_id>\d+)/$', 'defaults.shortcut'),
+    (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),
 )
diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py
index 508bb3a1ca..436e9b7b23 100644
--- a/django/contrib/admin/urls.py
+++ b/django/contrib/admin/urls.py
@@ -8,7 +8,7 @@ else:
 
 urlpatterns = patterns('',
     ('^$', 'django.contrib.admin.views.main.index'),
-    ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
+    ('^r/', include('django.conf.urls.shortcut')),
     ('^jsi18n/$', i18n_view, {'packages': 'django.conf'}),
     ('^logout/$', 'django.contrib.auth.views.logout'),
     ('^password_change/$', 'django.contrib.auth.views.password_change'),