diff --git a/src/OFS/Application.py b/src/OFS/Application.py
index d039dbc851..fbadc6f7db 100644
--- a/src/OFS/Application.py
+++ b/src/OFS/Application.py
@@ -28,6 +28,7 @@
 from App.ProductContext import ProductContext
 from DateTime import DateTime
 from OFS import bbb
+from OFS.FindSupport import FindSupport
 from OFS.metaconfigure import get_packages_to_initialize
 from OFS.metaconfigure import package_initialized
 from OFS.userfolder import UserFolder
@@ -53,7 +54,7 @@
 
 
 @implementer(IApplication)
-class Application(ApplicationDefaultPermissions, Folder.Folder):
+class Application(ApplicationDefaultPermissions, Folder.Folder, FindSupport):
     """Top-level system object"""
 
     security = ClassSecurityInfo()
diff --git a/src/OFS/FindSupport.py b/src/OFS/FindSupport.py
index a2964e3794..d9f3778c07 100644
--- a/src/OFS/FindSupport.py
+++ b/src/OFS/FindSupport.py
@@ -36,6 +36,7 @@
 class FindSupport(Base):
     """Find support for Zope Folders"""
 
+    manage_options = ()
     security = ClassSecurityInfo()
 
     security.declareProtected(view_management_screens, 'ZopeFind')
diff --git a/src/OFS/Folder.py b/src/OFS/Folder.py
index 6bafec978e..d974e4fa41 100644
--- a/src/OFS/Folder.py
+++ b/src/OFS/Folder.py
@@ -20,6 +20,7 @@
 from zope.interface import implementer
 
 from OFS import bbb
+from OFS.FindSupport import FindSupport
 from OFS.interfaces import IFolder
 from OFS.Lockable import LockableItem
 from OFS.ObjectManager import ObjectManager
@@ -57,7 +58,8 @@ class Folder(
         RoleManager,
         Collection,
         LockableItem,
-        Item):
+        Item,
+        FindSupport):
 
     """Folders are basic container objects that provide a standard
     interface for object management. Folder objects also implement
diff --git a/src/OFS/PropertyManager.py b/src/OFS/PropertyManager.py
index d526be3ffa..d119d2dc1c 100644
--- a/src/OFS/PropertyManager.py
+++ b/src/OFS/PropertyManager.py
@@ -83,7 +83,7 @@ class PropertyManager(Base):
     security.setPermissionDefault(access_contents_information,
                                   ('Anonymous', 'Manager'))
 
-    manage_options = tuple()
+    manage_options = ()
 
     title = ''
     _properties = (
diff --git a/src/OFS/interfaces.py b/src/OFS/interfaces.py
index 67a3e2bad5..e934e261da 100644
--- a/src/OFS/interfaces.py
+++ b/src/OFS/interfaces.py
@@ -922,7 +922,8 @@ def manage_delProperties(ids=None, REQUEST=None):
         """Delete one or more properties specified by 'ids'."""
 
 
-class IFolder(IObjectManager, IPropertyManager, IRoleManager, IItem):
+class IFolder(IObjectManager, IPropertyManager, IRoleManager,
+              IItem, IFindSupport):
     """Folders are basic container objects that provide a standard
     interface for object management. Folder objects also implement a
     management interface and can have arbitrary properties.