diff --git a/libsrc/c64/crt0.s b/libsrc/c64/crt0.s
index 1c5f3f97e..885775414 100644
--- a/libsrc/c64/crt0.s
+++ b/libsrc/c64/crt0.s
@@ -54,10 +54,10 @@ Head:   .word   @Next
 ; ------------------------------------------------------------------------
 ; Actual code
 
-	ldy	#zpspace-1
-L1:	lda	sp,y
-   	sta	zpsave,y	; Save the zero page locations we need
-	dey
+	ldx    	#zpspace-1
+L1:	lda	sp,x
+   	sta	zpsave,x	; Save the zero page locations we need
+	dex
        	bpl	L1
 
 ; Close open files
@@ -80,7 +80,6 @@ L1:	lda	sp,y
 
 	lda	$01
 	sta	mmusave      	; Save the memory configuration
-	lda	$01
 	and	#$F8
        	ora	#$06		; Enable kernal+I/O, disable basic
 	sta	$01
@@ -117,10 +116,10 @@ _exit:	jsr	doatexit  	; call exit functions
 
 ; Copy back the zero page stuff
 
-	ldy	#zpspace-1
-L2:	lda	zpsave,y
-	sta	sp,y
-	dey
+       	ldx	#zpspace-1
+L2:	lda	zpsave,x
+	sta	sp,x
+	dex
        	bpl	L2
 
 ; Reset changed vectors, back to basic