diff --git a/cms/djangoapps/contentstore/management/commands/export.py b/cms/djangoapps/contentstore/management/commands/export.py
index eb7800d46cb3..90db8750d922 100644
--- a/cms/djangoapps/contentstore/management/commands/export.py
+++ b/cms/djangoapps/contentstore/management/commands/export.py
@@ -14,11 +14,11 @@
 
 
 class Command(BaseCommand):
-    help = 'Import the specified data directory into the default ModuleStore'
+    help = 'Export the specified data directory into the default ModuleStore'
 
     def handle(self, *args, **options):
         if len(args) != 2:
-            raise CommandError("import requires two arguments: <course location> <output path>")
+            raise CommandError("export requires two arguments: <course location> <output path>")
 
         course_id = args[0]
         output_path = args[1]
@@ -30,4 +30,4 @@ def handle(self, *args, **options):
         root_dir = os.path.dirname(output_path)
         course_dir = os.path.splitext(os.path.basename(output_path))[0]
 
-        export_to_xml(modulestore('direct'), contentstore(), location, root_dir, course_dir)
+        export_to_xml(modulestore('direct'), contentstore(), location, root_dir, course_dir, modulestore())
diff --git a/cms/djangoapps/contentstore/management/commands/export_all_courses.py b/cms/djangoapps/contentstore/management/commands/export_all_courses.py
new file mode 100644
index 000000000000..69cfb298fbfd
--- /dev/null
+++ b/cms/djangoapps/contentstore/management/commands/export_all_courses.py
@@ -0,0 +1,47 @@
+###
+### Script for exporting all courseware from Mongo to a directory
+###
+import os
+
+from django.core.management.base import BaseCommand, CommandError
+from xmodule.modulestore.xml_exporter import export_to_xml
+from xmodule.modulestore.django import modulestore
+from xmodule.contentstore.django import contentstore
+from xmodule.course_module import CourseDescriptor
+
+
+unnamed_modules = 0
+
+
+class Command(BaseCommand):
+    help = 'Export all courses from mongo to the specified data directory'
+
+    def handle(self, *args, **options):
+        if len(args) != 1:
+            raise CommandError("export requires one argument: <output path>")
+
+        output_path = args[0]
+
+        cs = contentstore()
+        ms = modulestore('direct')
+        root_dir = output_path
+        courses = ms.get_courses()
+
+        print "%d courses to export:" % len(courses)
+        cids = [x.id for x in courses]
+        print cids
+
+        for course_id in cids:
+
+            print "-"*77
+            print "Exporting course id = {0} to {1}".format(course_id, output_path)
+
+            if 1:
+                try:
+                    location = CourseDescriptor.id_to_location(course_id)
+                    course_dir = course_id.replace('/', '...')
+                    export_to_xml(ms, cs, location, root_dir, course_dir, modulestore())
+                except Exception as err:
+                    print "="*30 + "> Oops, failed to export %s" % course_id
+                    print "Error:"
+                    print err