diff --git a/Makefile b/Makefile
index e1cf06e700b80e4656970535abae6d28fe84a140..2d0dbb53dee8b1d13fa8118d932a55435a144370 100644
--- a/Makefile
+++ b/Makefile
@@ -407,8 +407,10 @@ clean_all:
 resources:
 	${MKDIR} ${RESDIR}.${COMPONENT}
 	${MKDIR} ${RESDIR}.CLib
-	${CP} clib.Resources.${LOCALE}.Messages ${RESDIR}.CLib.Messages ${CPFLAGS}
-	${CP} rlib.Resources.${LOCALE}.Messages ${RESDIR}.RISC_OSLib.Messages ${CPFLAGS}
+	IfThere clib.Resources.${LOCALE}.<System>.Messages Then Set MessagesFile clib.Resources.${LOCALE}.<System>.Messages else Set MessagesFile clib.Resources.${LOCALE}.Messages
+	${CP} <MessagesFile> ${RESDIR}.CLib.Messages ${CPFLAGS}
+	IfThere rlib.Resources.${LOCALE}.<System>.Messages Then Set MessagesFile rlib.Resources.${LOCALE}.<System>.Messages else Set MessagesFile rlib.Resources.${LOCALE}.Messages
+	${CP} <MessagesFile> ${RESDIR}.RISC_OSLib.Messages ${CPFLAGS}
 	@echo ${COMPONENT}: resource files copied
 
 dirs:
diff --git a/VersionASM b/VersionASM
index b26073698e0846296825af6036b2de1c2f5ee4f9..630c68f810a130b0d72bf031d9184f6b1b696cad 100644
--- a/VersionASM
+++ b/VersionASM
@@ -5,8 +5,8 @@
 			GBLA    Module_Version
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
-Module_MajorVersion	SETS    "4.86"
-Module_Version          SETA    486
+Module_MajorVersion	SETS    "4.87"
+Module_Version          SETA    487
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "27 Aug 1998"
 		        END
diff --git a/VersionNum b/VersionNum
index 92e09ce9aa3e5d102a47cf34d3c72b2ac8181d12..da507510cca08ef61f860d6fcee5aff1340637bb 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,14 +1,14 @@
-/* (4.86)
+/* (4.87)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	4.86
+#define Module_MajorVersion_CMHG     	4.87
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		27 Aug 1998
 
-#define Module_MajorVersion     	"4.86"
-#define Module_Version                  486
+#define Module_MajorVersion     	"4.87"
+#define Module_Version                  487
 #define Module_MinorVersion		""
 #define Module_Date      		"27 Aug 1998"
 
diff --git a/c/alloc b/c/alloc
index 3f5835c33bfc53e3357e87b11b46a7f9192ac4da..7ebc68b30ea81f3973f2c2e814c9a1a1c4558251 100644
--- a/c/alloc
+++ b/c/alloc
@@ -14,9 +14,6 @@
  */
 /*
   Title:        alloc - Storage management (dynamic allocation/deallocation)
-  $Revision$  LDS 31-Jul-87 $ BJK 23-Oct-1987
-  $Revision$  LH 22-Dec-1987
-  $Revision$  LH 03-Feb-1988
 
   Copyright (C) Acorn Computers Ltd., 1988
 */
diff --git a/c/armprof b/c/armprof
index 6eb0b93107e9de3d0f0e24c6a85978f39ec92a36..fe171bb50283a9c4b5ce25ddcf3c3e53aec7c435 100644
--- a/c/armprof
+++ b/c/armprof
@@ -17,12 +17,6 @@
 /* Copyright (C) Acorn Computers Ltd., 1988, 1990     */
 /* RISCOS-specific profiling support                  */
 
-/*
- * RCS $Revision$
- * Checkin $Date$
- * Revising $Author$
- */
-
 #include <stdio.h>
 
 /* HIDDEN EXPORTS */
diff --git a/h/alloc b/h/alloc
index 48b91bcd6cd442e11eaf148e48200bcec0dddecd..900c1156f06e511b36e04a5d46041bdc1c8d22c1 100644
--- a/h/alloc
+++ b/h/alloc
@@ -15,7 +15,7 @@
 /*
   Title:        alloc - Storage management (dynamic allocation/deallocation)
   Copyright:    (C) 1987, Acorn Computers Ltd., Cambridge, England.
-  $Revision$  LDS, LH 03-Nov-89
+  Revision: 4.2  LDS, LH 03-Nov-89
 */
 
 #ifndef __alloc__h
diff --git a/rlib/Resources/UK/RCA/Messages b/rlib/Resources/UK/RCA/Messages
new file mode 100644
index 0000000000000000000000000000000000000000..72d541c49920dbb3834da505c3f8889c742e1c12
--- /dev/null
+++ b/rlib/Resources/UK/RCA/Messages
@@ -0,0 +1,30 @@
+alarm1:Unable to read monotonic time
+alarm2:Not enough memory to set alarm
+dbox1:Not enough memory to create dialogue box
+dbox2:Templates file not loaded for use with dialogue boxes
+flex1:Flex memory error
+flex2:Not enough memory, or not within *desktop world
+flex3:Flex not initialised
+fontmenu1:Incorrect parameter to font_makemenu
+fontmenu2:Not enough memory for font menu
+fontmenu3:Not enough memory for font identifier
+menu1:Not enough memory for menu
+resspr1:Not enough memory to load sprite file '%s'
+saveas1:To save, drag the icon to a directory display
+template1:Template '%s' not found
+template2:Not enough memory to load templates
+txtopt1:Not enough memory to cache options name
+signal1:Data abort
+signal2:Arithmetic exception
+signal3:Illegal instruction
+signal4:Escape
+signal5:Internal address error
+signal6:Termination request
+wimpt1:The Network Computer has experienced a technical difficulty. Please select continue.
+wimpt2:The Network Computer has experienced a technical difficulty. Please select continue.
+wimpt3:Not enough memory for active windows
+win1:Too many windows
+win2:Not enough memory to change window title
+xferrecv1:Can't transfer file (Scrap directory not set)
+xferrecv2:Data transfer failed
+xfersend2:Selection
diff --git a/rlib/c/alarm b/rlib/c/alarm
index 65b2a87a25652c9f63d274d309227bd80355f1de..f01b2358601db01350b451687da2a89106ffbe74 100644
--- a/rlib/c/alarm
+++ b/rlib/c/alarm
@@ -233,7 +233,6 @@ void alarm_removeall(void *handle)
     }
 }
 
-#ifndef UROM
 BOOL alarm_anypending(void *handle)
 {
   ALARM *p = alarm__pending_list;
@@ -246,4 +245,3 @@ BOOL alarm_anypending(void *handle)
 
   return FALSE;
 }
-#endif
diff --git a/s/version b/s/version
index bcd26e515d79b0085c066b634fd6547eda9bceaa..9e035518a37b77719dc9cad7e7338cf4f17091e8 100644
--- a/s/version
+++ b/s/version
@@ -12,5 +12,8 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 ;
-        DCB     "4.86 (27 Jul 1998)"
+
+	GET	VersionASM
+
+        DCB     Module_MajorVersion " (" Module_Date ") " Module_MinorVersion
         END