diff --git a/Components/ROOL/Disc b/Components/ROOL/Disc
index 17e6ad408acf4f49ac63de7298320be3280ea805..bb6e5b2860fac0bd2aa988f9593afc568c18c73c 100644
--- a/Components/ROOL/Disc
+++ b/Components/ROOL/Disc
@@ -144,6 +144,11 @@ InetSetup               -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
 Scrap                   -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
 Unicode                 -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
 Fonts                   -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources INSTFLAG=all
+ResApp                  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
+ResApp                  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=WimpPool
+ResApp                  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=WindowTools
+ResApp                  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=PaintPool
+ResApp                  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources RESMOD=DrawPool
 
 System                  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources
 Config2Installer        -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.Resources.!System.360.Modules
@@ -179,9 +184,9 @@ Config2PluginPinSetup   -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook
 Config2PluginScrnSetup  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure
 Config2PluginSndSetup   -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure
 Config2PluginWindSetup  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure
-Config2PluginxxxxMerge  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.!BootSetup COMPONENT=BootMerge 
-Config2PluginxxxxMerge  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.!FontSetup COMPONENT=FontMerge 
-Config2PluginxxxxMerge  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure COMPONENT=SysMerge 
+Config2PluginxxxxMerge  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.!BootSetup COMPONENT=BootMerge
+Config2PluginxxxxMerge  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure.!FontSetup COMPONENT=FontMerge
+Config2PluginxxxxMerge  -options INSTDIR=<Install$Dir>.HardDisc4.!Boot.RO500Hook.Res.Configure COMPONENT=SysMerge
 
 # Apps
 ###ARPlayer                -options INSTDIR=<Install$Dir>.HardDisc4.Apps
diff --git a/ModuleDB b/ModuleDB
index d653268849a26264150213afc1848c64c766d71a..8a3bd36d1bcdf2b1b754741d27926ed48f9bc62d 100644
--- a/ModuleDB
+++ b/ModuleDB
@@ -708,6 +708,7 @@ MchConfig               C       SystemRes.MchConfig                     SystemRe
 Public                  RES     SystemRes.Public                        SystemRes               Public
 InetSetup               C       SystemRes.InetSetup                     SystemRes               InetSetup
 FontMerge               C       SystemRes.Configure                     SystemRes               FontMerge
+ResApp                  RES     SystemRes.ResApp                        SystemRes               !+Resource
 
 Config2Installer        C       SystemRes.Configure2.Installer          SystemRes               Installer
 Config2Main             C       SystemRes.Configure2.Main               SystemRes               Main
diff --git a/VersionNum b/VersionNum
index 3917349237c38ef072ee5670e28ea8b6f272a5a4..b39f7ba7fb0247a7c7d3de5c509aa1c5e6e46107 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (4.84)
+/* (4.85)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        4.84
+#define Module_MajorVersion_CMHG        4.85
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                30 Sep 2009
+#define Module_Date_CMHG                01 Oct 2009
 
-#define Module_MajorVersion             "4.84"
-#define Module_Version                  484
+#define Module_MajorVersion             "4.85"
+#define Module_Version                  485
 #define Module_MinorVersion             ""
-#define Module_Date                     "30 Sep 2009"
+#define Module_Date                     "01 Oct 2009"
 
-#define Module_ApplicationDate          "30-Sep-09"
+#define Module_ApplicationDate          "01-Oct-09"
 
 #define Module_ComponentName            "BuildSys"
 #define Module_ComponentPath            "castle/RiscOS/BuildSys"
 
-#define Module_FullVersion              "4.84"
-#define Module_HelpVersion              "4.84 (30 Sep 2009)"
-#define Module_LibraryVersionInfo       "4:84"
+#define Module_FullVersion              "4.85"
+#define Module_HelpVersion              "4.85 (01 Oct 2009)"
+#define Module_LibraryVersionInfo       "4:85"