diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po
index 50a6cc1d..452fbcab 100644
Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index eef1f310..6c284550 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index 0d4a2881..76f8e439 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt
index 28ef4ccf..08ab3eb7 100644
--- a/BIN/CP.S.txt
+++ b/BIN/CP.S.txt
@@ -52,6 +52,7 @@ bCopy			.BS 1
 hToDelete		.BS 1
 CopyRC			.BS 1
 RC				.BS 1
+bWildcard		.BS 1
 bContinue		.BS 1
 bRecurse		.BS 1
 bNoConfirm		.BS 1
diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt
index 9b46b402..a44f0011 100644
--- a/BIN/MV.S.txt
+++ b/BIN/MV.S.txt
@@ -50,6 +50,7 @@ hDstFile		.BS 1
 bPause			.BS 1
 bCopy			.BS 1
 hToDelete		.BS 1
+bWildcard		.BS 1
 RC				.BS 1
 CopyRC			.BS 1
 bContinue		.BS 1
diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt
index 2957af3a..2e0d7a94 100644
--- a/BIN/RM.S.txt
+++ b/BIN/RM.S.txt
@@ -50,6 +50,7 @@ bPause			.BS 1
 bCopy			.BS 1
 hToDelete		.BS 1
 RC				.BS 1
+bWildcard		.BS 1
 CopyRC			.BS 1
 bContinue		.BS 1
 bRecurse		.BS 1
diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt
index 0070c04a..b00d7277 100644
--- a/BIN/X.CPMVRM.S.txt
+++ b/BIN/X.CPMVRM.S.txt
@@ -87,7 +87,9 @@ CS.INIT			>SYSCALL GetArgC
 				sta (pData),y
 				bra .1
 				
-.4				ldy #index
+.4				tax						Save len
+
+				ldy #index
 				lda (pData),y
 
 				.DO X.COPY.TO.DEST=1
@@ -96,10 +98,12 @@ CS.INIT			>SYSCALL GetArgC
 				bne .99
 				.FIN
 			
+				jsr CS.INIT.Check.Wildcard
+				
 				>LDYA ZPPtr1
 				jsr InitSrcDirPatYA
 				bcc .1					success, scan for any other args
-				rts
+.9				rts
 
 				.DO X.COPY.TO.DEST=1
 .5				ldy #hDstBasePath				
@@ -141,6 +145,29 @@ CS.INIT			>SYSCALL GetArgC
 				clc
 				rts
 *--------------------------------------
+CS.INIT.Check.Wildcard
+				ldy #0
+				ldx #0
+				
+.40				iny
+				lda (ZPPtr1),y
+				cmp #'?'
+				beq .41
+				cmp #'*'
+				bne .42
+				
+.41				lda #$ff
+				tax
+				
+.42				tya
+				cmp (ZPPtr1)
+				bne .40
+				
+				txa
+				ldy #bWildcard
+				sta (pData),y
+				rts
+*--------------------------------------
 CS.RUN			>SYSCALL GetC
 				bcs .11					no char
 				
@@ -181,12 +208,12 @@ CS.RUN			>SYSCALL GetC
 				pha
 				ldy #hToDelete
 				lda (pData),y
-				>SYSCALL FreeMemA
-
-				ldy #hToDelete
+				pha
 				lda #0
 				sta (pData),y
 				pla
+				>SYSCALL FreeMemA
+				pla
 				plp
 				jsr CS.RUN.CheckErr
 				bcs .9