diff --git a/Products/CMFPlone/CatalogTool.py b/Products/CMFPlone/CatalogTool.py
index 17c6001ec8..f63503281c 100644
--- a/Products/CMFPlone/CatalogTool.py
+++ b/Products/CMFPlone/CatalogTool.py
@@ -488,6 +488,7 @@ def indexObject(obj, path):
                     pass
         self.manage_catalogClear()
         portal = aq_parent(aq_inner(self))
+        indexObject(portal, '')
         portal.ZopeFindAndApply(
             portal,
             search_sub=True,
diff --git a/Products/CMFPlone/Portal.py b/Products/CMFPlone/Portal.py
index c477c3fcbe..0474b4f6ca 100644
--- a/Products/CMFPlone/Portal.py
+++ b/Products/CMFPlone/Portal.py
@@ -222,19 +222,6 @@ def isEffective(self, date):
         # Override DefaultDublinCoreImpl's test, since we are always viewable.
         return 1
 
-    # Ensure portals don't get cataloged.
-    def indexObject(self):
-        pass
-
-    def unindexObject(self):
-        pass
-
-    def reindexObject(self, idxs=None):
-        pass
-
-    def reindexObjectSecurity(self, skip_self=False):
-        pass
-
 
 # Remove the IContentish interface so we don't listen to events that won't
 # apply to the site root, ie handleUidAnnotationEvent
diff --git a/Products/CMFPlone/tests/testCatalogTool.py b/Products/CMFPlone/tests/testCatalogTool.py
index 2dd3fe05f2..50ab21231a 100644
--- a/Products/CMFPlone/tests/testCatalogTool.py
+++ b/Products/CMFPlone/tests/testCatalogTool.py
@@ -31,7 +31,7 @@
 group2 = 'g2'
 
 base_content = ['Members', 'aggregator', 'aggregator',
-                'events', 'news', TEST_USER_ID, 'doc']
+                'events', 'news', 'plone', TEST_USER_ID, 'doc']
 
 
 class TestCatalogSetup(PloneTestCase):
diff --git a/Products/CMFPlone/tests/testPortalCreation.py b/Products/CMFPlone/tests/testPortalCreation.py
index 327f1f4bdd..8dcaea6be8 100644
--- a/Products/CMFPlone/tests/testPortalCreation.py
+++ b/Products/CMFPlone/tests/testPortalCreation.py
@@ -86,6 +86,13 @@ def testWorkflowIsActionProvider(self):
             'portal_workflow' in self.actions.listActionProviders()
         )
 
+    def testPortalIsIndexed(self):
+        # The Plone site should be cataloged
+        res = self.catalog(getId="plone")
+        self.assertEqual(len(res), 1)
+        self.assertEqual(res[0].getId, "plone")
+        self.assertEqual(res[0].Title, "Welcome to Plone")
+
     def testMembersFolderMetaType(self):
         # Members folder should have meta_type 'Dexterity Container'
         members = self.membership.getMembersFolder()
diff --git a/news/3314.bugfix b/news/3314.bugfix
new file mode 100644
index 0000000000..51014203e4
--- /dev/null
+++ b/news/3314.bugfix
@@ -0,0 +1 @@
+The Plone site root is cataloged