diff --git a/repository.xml b/repository.xml
index 78ad2bd934339f8115319435ecf236ced024f068..042cd346547c946d0e816ebe71705fafbbbe9404 100644
--- a/repository.xml
+++ b/repository.xml
@@ -96,9 +96,17 @@
             persistence manager of the workspace:
             class: FQN of class implementing the PersistenceManager interface
         -->
-        <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
+        <!--
+            This persistance manager stores any persistance information in a derby database.
+        -->
+        <!--PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
           <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
           <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+        </PersistenceManager-->
+        <!--
+            This persistance manager stores any persistance information on the filesystem directly.
+        -->
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
         </PersistenceManager>
         <!--
             Search index and the file system it uses.
@@ -128,9 +136,17 @@
             a 'normal' persistence manager, but this could change in future
             implementations.
         -->
-        <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
+        <!--
+            This persistance manager stores any persistance information in a derby database.
+        -->
+        <!--PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
           <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
           <param name="schemaObjectPrefix" value="version_"/>
+        </PersistenceManager-->
+        <!--
+            This persistance manager stores any persistance information on the filesystem directly.
+        -->
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
         </PersistenceManager>
     </Versioning>