diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index b157784df702..ccaa35aea0a9 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Office/Common-macosx.xcu \
 	org/openoffice/Office/Common-wnt.xcu \
 	org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
+	org/openoffice/Office/Common-32bit.xcu \
 	org/openoffice/Office/Jobs-impress.xcu \
 	org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
 	org/openoffice/Office/ProtocolHandler-impress.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index eef41786feed..f84bd1a8eeb6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -506,6 +506,13 @@
       </prop>
     </node>
   </node>
+  <node oor:name="Cache">
+    <node oor:name="GraphicManager">
+      <prop oor:name="TotalCacheSize" oor:type="xs:int">
+        <value install:module="32bit">200000000</value>
+      </prop>
+    </node>
+  </node>
   <node oor:name="Path">
     <node oor:name="Current">
       <prop oor:name="Temp" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index bfcefe2ec38b..5e146982cfaf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1495,7 +1495,7 @@
             objects.</desc>
             <label>Total Image Cache Size</label>
           </info>
-          <value>200000000</value>
+          <value>400000000</value>
         </prop>
         <prop oor:name="ObjectCacheSize" oor:type="xs:int" oor:nillable="false">
           <info>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 294f9de9400f..87792b6f062e 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -351,6 +351,11 @@ else
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibexttextcatdata.xcu
 endif
 
+ifneq ($(filter $(CPUNAME),POWERPC INTEL ARM HPPA GODSON M68K SPARC S390),)
+postprocess_FILES_main += \
+	$(postprocess_MOD)/org/openoffice/Office/Common-32bit.xcu
+endif
+
 postprocess_DEPS_math := main
 postprocess_FILES_math := \
 	$(postprocess_XCS)/Office/UI/MathCommands.xcs \