diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index f089e80b16..d06744e9fa 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -30,7 +30,7 @@ class Command(BaseCommand):
             raise CommandError("%r is not a valid port number." % port)
 
         use_reloader = options.get('use_reloader', True)
-        admin_media_dir = options.get('admin_media_dir', '')
+        admin_media_path = options.get('admin_media_path', '')
         shutdown_message = options.get('shutdown_message', '')
         quit_command = (sys.platform == 'win32') and 'CTRL-BREAK' or 'CONTROL-C'
 
@@ -42,7 +42,7 @@ class Command(BaseCommand):
             print "Development server is running at http://%s:%s/" % (addr, port)
             print "Quit the server with %s." % quit_command
             try:
-                path = admin_media_dir or django.__path__[0] + '/contrib/admin/media'
+                path = admin_media_path or django.__path__[0] + '/contrib/admin/media'
                 handler = AdminMediaHandler(WSGIHandler(), path)
                 run(addr, int(port), handler)
             except WSGIServerException, e: