diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt
index 18bde264..b2673f50 100644
--- a/Doc/ChangeLog.txt
+++ b/Doc/ChangeLog.txt
@@ -39,6 +39,8 @@ Version 3.1.1
 - WBW: Added preliminary support for DSKYng
 - WBW: Elevated MBC to a platform
 - WBW: Added support for MBC user LEDs
+- PMS: Early DMA support
+- W?S: Updated FLASH software to v1.3.5 (supports 128KB A29010B, 512KB A29040B)
 
 Version 3.1
 -----------
diff --git a/Source/Apps/Clean.cmd b/Source/Apps/Clean.cmd
index 70b6dcee..36424e12 100644
--- a/Source/Apps/Clean.cmd
+++ b/Source/Apps/Clean.cmd
@@ -11,3 +11,4 @@ setlocal & cd XM && call Clean || exit /b 1 & endlocal
 setlocal & cd FDU && call Clean || exit /b 1 & endlocal
 setlocal & cd Tune && call Clean || exit /b 1 & endlocal
 setlocal & cd FAT && call Clean || exit /b 1 & endlocal
+setlocal & cd I2C && call Clean || exit /b 1 & endlocal
diff --git a/Source/Apps/I2C/Makefile b/Source/Apps/I2C/Makefile
index cdee4fdd..e205dc82 100644
--- a/Source/Apps/I2C/Makefile
+++ b/Source/Apps/I2C/Makefile
@@ -1,4 +1,4 @@
-OBJECTS = i2cscan.com, rtcds7.com, i2clcd.com
+OBJECTS = i2cscan.com rtcds7.com i2clcd.com
 DEST = ../../../Binary/Apps
 TOOLS = ../../../Tools
 
diff --git a/Source/Apps/Makefile b/Source/Apps/Makefile
index c2785b51..322bb6cc 100644
--- a/Source/Apps/Makefile
+++ b/Source/Apps/Makefile
@@ -1,6 +1,6 @@
 OBJECTS = sysgen.com survey.com \
 	syscopy.com assign.com format.com talk.com mode.com rtc.com \
-	timer.com inttest.com rtcds7.com rtchb.com ppidetst.com tstdskng.com
+	timer.com inttest.com rtchb.com ppidetst.com tstdskng.com
 OTHERS = *.hex *.com
 SUBDIRS = XM FDU FAT Tune I2C
 DEST = ../../Binary/Apps
diff --git a/Source/Apps/rtc.asm b/Source/Apps/rtc.asm
index 0d1f94bf..5a4ebeb5 100644
--- a/Source/Apps/rtc.asm
+++ b/Source/Apps/rtc.asm
@@ -27,6 +27,8 @@
 ;
 ;[2020/05/15] v1.6 Added Warm Start option
 ;
+;[2021/07/10] v1.7 Support MBC (AJL)
+;
 ; Constants
 ;
 mask_data	.EQU	%10000000	; RTC data line
@@ -1047,9 +1049,9 @@ RTC_HELP
 RTC_INIT:
 	CALL	IDBIO		; Id BIOS, 1=HBIOS, 2=UBIOS
 	DEC	A		; Test for HBIOS
-	JR	Z,HINIT		; Do HBIOS setup
+	JP	Z,HINIT		; Do HBIOS setup
 	DEC	A		; Test for UBIOS
-	JR	Z,UINIT		; Do UBIOS setup
+	JP	Z,UINIT		; Do UBIOS setup
 ;
 	; Neither UNA nor RomWBW
 	LD	DE,BIOERR	; BIOS error message
@@ -1620,7 +1622,7 @@ TESTING_BIT_DELAY_OVER:
 
 RTC_HELP_MSG:
 	.DB	0Ah, 0Dh		; line feed and carriage return
-	.TEXT	"RTC: Version 1.5a"
+	.TEXT	"RTC: Version 1.7"
 	.DB	0Ah, 0Dh		; line feed and carriage return
 	.TEXT	"Commands: E)xit T)ime st(A)rt S)et R)aw L)oop C)harge N)ocharge D)elay I)nit G)et P)ut B)oot W)arm-start H)elp"
 	.DB	0Ah, 0Dh		; line feed and carriage return
diff --git a/Source/HBIOS/cfg_mbc.asm b/Source/HBIOS/cfg_mbc.asm
index 129dc15f..ac0c488c 100644
--- a/Source/HBIOS/cfg_mbc.asm
+++ b/Source/HBIOS/cfg_mbc.asm
@@ -229,3 +229,7 @@ AY_CLK		.EQU	CPUOSC / 4	; DEFAULT TO CPUOSC / 4
 AYMODE		.EQU	AYMODE_NONE	; AY: DRIVER MODE: AYMODE_[SCG/N8/RCZ80/RCZ180]
 ;
 SPKENABLE	.EQU	TRUE		; SPK: ENABLE RTC LATCH IOBIT SOUND DRIVER (SPK.ASM)
+;
+DMAENABLE	.EQU	FALSE		; DMA: ENABLE DMA DRIVER (DMA.ASM)
+DMABASE		.EQU	$E0		; DMA: DMA BASE ADDRESS
+DMAMODE		.EQU	DMAMODE_NONE	; DMA: DMA MODE (NONE|ECB|Z180|Z280|RC)
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 92a29c8a..c922a8eb 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1225,6 +1225,15 @@ Z280_INITZ:
 	OUT	(EIPC_SCDP),A		; SET SYSTEM CONTROL DATA PORT (SCDP)
 #ENDIF
 ;
+#IF ((MEMMGR == MM_SBC) | (MEMMGR == MM_MBC))
+	; SET PAGING REGISTERS
+  #IFDEF ROMBOOT
+	XOR	A
+	OUT	(MPCL_RAM),A		; REMOVE RAM FIRST!
+	OUT	(MPCL_ROM),A		; SELECT ROM PAGE 0
+  #ENDIF
+#ENDIF
+;
 #IF (MEMMGR == MM_Z2)
 	; SET PAGING REGISTERS
   #IFDEF ROMBOOT
diff --git a/Source/Images/Common/FLASH.COM b/Source/Images/Common/FLASH.COM
index c81f9c54..d1833a1b 100644
Binary files a/Source/Images/Common/FLASH.COM and b/Source/Images/Common/FLASH.COM differ
diff --git a/Source/RomDsk/ROM_1024KB/FLASH.COM b/Source/RomDsk/ROM_1024KB/FLASH.COM
index c81f9c54..d1833a1b 100644
Binary files a/Source/RomDsk/ROM_1024KB/FLASH.COM and b/Source/RomDsk/ROM_1024KB/FLASH.COM differ
diff --git a/Source/RomDsk/ROM_512KB/FLASH.COM b/Source/RomDsk/ROM_512KB/FLASH.COM
index c81f9c54..d1833a1b 100644
Binary files a/Source/RomDsk/ROM_512KB/FLASH.COM and b/Source/RomDsk/ROM_512KB/FLASH.COM differ
diff --git a/Source/ver.inc b/Source/ver.inc
index d74d870b..da066ebd 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.86"
+#DEFINE BIOSVER	"3.1.1-pre.87"
diff --git a/Source/ver.lib b/Source/ver.lib
index 9fd10d30..c85d1eba 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.86"
+	db	"3.1.1-pre.87"
 	endm