diff --git a/Makefile b/Makefile
index 7ff82e3fe48f716ee820b6e7ca34beafe6ae82bb..e11203924bcdb0e883a73b204426f7bc86ad2f83 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,12 @@ resources-: resources_common
 	TokenCheck LocalRes:Messages
 	print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
 
+BBETYPE = kernel
+bbe-kernel: bbe-generic-resources-get-alias
+	BBE_Export_Dir Resources.${LOCALE}.${USERIF}
+	BBE_Export_File Resources.${LOCALE}.Messages
+	BBE_Export_File Resources.${LOCALE}.CmdHelp
+
 ${TARGET}: ${SOURCE} s.TMOSHelp
 	${MKDIR} rm.${MACHINE}
 	${AS} ${ASFLAGS} ${SOURCE}
diff --git a/VersionASM b/VersionASM
index 2757380ea4343f564f6f0b587db3e424e0372485..e0497a6ce3891e9a4b827a2077fd7450afbee88e 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,14 +11,14 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "5.38"
-Module_Version          SETA    538
+Module_MajorVersion     SETS    "5.39"
+Module_Version          SETA    539
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "21 Nov 2000"
-Module_ApplicationDate2 SETS    "21-Nov-00"
-Module_ApplicationDate4 SETS    "21-Nov-2000"
+Module_Date             SETS    "05 Jan 2001"
+Module_ApplicationDate2 SETS    "05-Jan-01"
+Module_ApplicationDate4 SETS    "05-Jan-2001"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.38"
-Module_HelpVersion      SETS    "5.38 (21 Nov 2000)"
+Module_FullVersion      SETS    "5.39"
+Module_HelpVersion      SETS    "5.39 (05 Jan 2001)"
                         END
diff --git a/VersionNum b/VersionNum
index 87d7c2414794968b201087db38c170d29314ce33..c8da811c48bc1dbbbee9d103ba489192bb542bc9 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,22 +1,22 @@
-/* (5.38)
+/* (5.39)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        5.38
+#define Module_MajorVersion_CMHG        5.39
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                21 Nov 2000
+#define Module_Date_CMHG                05 Jan 2001
 
-#define Module_MajorVersion             "5.38"
-#define Module_Version                  538
+#define Module_MajorVersion             "5.39"
+#define Module_Version                  539
 #define Module_MinorVersion             ""
-#define Module_Date                     "21 Nov 2000"
+#define Module_Date                     "05 Jan 2001"
 
-#define Module_ApplicationDate2         "21-Nov-00"
-#define Module_ApplicationDate4         "21-Nov-2000"
+#define Module_ApplicationDate2         "05-Jan-01"
+#define Module_ApplicationDate4         "05-Jan-2001"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.38"
-#define Module_HelpVersion              "5.38 (21 Nov 2000)"
+#define Module_FullVersion              "5.39"
+#define Module_HelpVersion              "5.39 (05 Jan 2001)"
diff --git a/s/ARM600 b/s/ARM600
index ccd550f9b9a623b614930c6db28b912f8b00e9f3..f8059540bbd7ad90e3b5cfa8f78e5ec001189f5a 100644
--- a/s/ARM600
+++ b/s/ARM600
@@ -1967,9 +1967,11 @@ Add_DRAM_bank
 	BLS	%FT20			; If start <= end, then block is not fragmented.
 	CMP	r2, r0			; Check the size of the fragment before the image.
 	MOV	r0, r1			; Store old start address
+        SUB     r1, r1, #1              ; last byte of image (definitely in block)
 	AND	r1, r1, r7		; Get the start of the block
 	BLNE	Allocate_DRAM_fragment	; Allocate it if it's non-zero.
 	MOV	r1, r0			; Restore the old start of fragment
+        SUB     r0, r0, #1              ; last byte of image (definitely in block)
 	AND	r0, r0, r7		; Get the start of the block again.
 	ADD	r2, r0, r8		; End of next fragment is the end of the block.