Index: oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
===================================================================
--- oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java	(revision 1821986)
+++ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java	(working copy)
@@ -22,6 +22,7 @@
 import javax.annotation.Nonnull;
 
 import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.document.bundlor.BundledTypesRegistry.BundledTypesRegistryBuilder;
 import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -44,10 +45,14 @@
                 NodeBuilder dns = system.child(DOCUMENT_NODE_STORE);
                 dns.setProperty(JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_UNSTRUCTURED, Type.NAME);
 
-                NodeState registryState = BundledTypesRegistry.builder()
-                        .forType("nt:file", "jcr:content")
-                        .build();
-                NodeBuilder bundlor = dns.setChildNode(BUNDLOR, registryState);
+                BundledTypesRegistryBuilder registryBuilder = BundledTypesRegistry.builder();
+                registryBuilder.forType("nt:file")
+                        .include("jcr:content").build();
+                registryBuilder.forType("nt:versionHistory")
+                        .include("jcr:rootVersion").include("jcr:versionLabels").build();
+                registryBuilder.forType("nt:version")
+                        .include("jcr:frozenNode").build();
+                NodeBuilder bundlor = dns.setChildNode(BUNDLOR, registryBuilder.build());
                 bundlor.setProperty(JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_UNSTRUCTURED, Type.NAME);
             }
         }