diff --git a/libsrc/cbm/Makefile b/libsrc/cbm/Makefile
index c8643855c..d3095640b 100644
--- a/libsrc/cbm/Makefile
+++ b/libsrc/cbm/Makefile
@@ -60,7 +60,8 @@ S_OBJS =	c_acptr.o	\
                 scratch.o       \
                 sysremove.o     \
                 systime.o       \
-		where.o         \
+		wherex.o        \
+                wherey.o        \
                 write.o
 
 all:	$(C_OBJS) $(S_OBJS)
diff --git a/libsrc/cbm/wherex.s b/libsrc/cbm/wherex.s
new file mode 100644
index 000000000..c7076ad84
--- /dev/null
+++ b/libsrc/cbm/wherex.s
@@ -0,0 +1,18 @@
+;
+; Ullrich von Bassewitz, 06.08.1998
+;
+; unsigned char wherex (void);
+;
+
+  	.export		_wherex
+        .import         PLOT
+
+
+.proc   _wherex
+  	sec
+  	jsr	PLOT		; Get cursor position
+  	tya
+        ldx     #$00
+  	rts
+.endproc
+        
diff --git a/libsrc/cbm/where.s b/libsrc/cbm/wherey.s
similarity index 53%
rename from libsrc/cbm/where.s
rename to libsrc/cbm/wherey.s
index a7bf17d3e..869be4baf 100644
--- a/libsrc/cbm/where.s
+++ b/libsrc/cbm/wherey.s
@@ -1,27 +1,18 @@
 ;
 ; Ullrich von Bassewitz, 06.08.1998
 ;
-; unsigned char wherex (void);
 ; unsigned char wherey (void);
+;
 
-
-	.export		_wherex, _wherey
+ 	.export		_wherey
         .import         PLOT
 
 
-_wherex:
-	sec
-	jsr	PLOT		; Get cursor position
-	tya
-	rts
-
-_wherey:
+.proc   _wherey
 	sec
 	jsr	PLOT		; Get cursor position
 	txa
+        ldx     #$00
 	rts
-
-
-
-
+.endproc