diff --git a/server/pulp/server/db/manage.py b/server/pulp/server/db/manage.py
index 85fb14f..e7884c7 100644
--- a/server/pulp/server/db/manage.py
+++ b/server/pulp/server/db/manage.py
@@ -47,6 +47,9 @@ def parse_args():
     parser.add_option('--dry-run', action='store_true', dest='dry_run', default=False,
                       help=_('Perform a dry run with no changes made. Returns 1 if there are '
                              'migrations to apply.'))
+    parser.add_option('--load-content-types', action='store_true', dest='load_content_types',
+                      default=False, help=_('Load content types.  WARNING: THIS WILL CAUSE INDEXES TO BE REBUILT'))
+
     options, args = parser.parse_args()
     if args:
         parser.error(_('Unknown arguments: %s') % ', '.join(args))
@@ -181,7 +184,9 @@ def _auto_manage_db(options):
     message = _('Loading content types.')
     _logger.info(message)
     # Note that if dry_run is False, None is always returned
-    old_content_types = load_content_types(dry_run=options.dry_run)
+    old_contnet_types = None
+    if options.load_content_types:
+        old_content_types = load_content_types(dry_run=options.dry_run)
     if old_content_types:
         for content_type in old_content_types:
             message = _(