diff --git a/libsrc/cbm/Makefile b/libsrc/cbm/Makefile
index 29dbc49f2..555109735 100644
--- a/libsrc/cbm/Makefile
+++ b/libsrc/cbm/Makefile
@@ -70,6 +70,7 @@ S_OBJS =	c_acptr.o	\
 		gotox.o 	\
 		gotoxy.o 	\
 		gotoy.o 	\
+                initcwd.o       \
                 open.o          \
                 oserrlist.o     \
 		oserror.o	\
diff --git a/libsrc/cbm/initcwd.s b/libsrc/cbm/initcwd.s
new file mode 100644
index 000000000..2df6dba85
--- /dev/null
+++ b/libsrc/cbm/initcwd.s
@@ -0,0 +1,35 @@
+;
+; Stefan Haubenthal, 2005-06-08
+;
+; CBM _curunit to _cwd
+;
+
+	.export		initcwd
+	.import		__curunit, __cwd
+	.import		pusha0, tosudiva0
+	.importzp	sreg, ptr1
+
+	.macpack	generic
+
+	.segment	"INIT"
+
+.proc	initcwd
+
+	lda	__curunit
+	jsr	pusha0
+	lda	#10
+	jsr	tosudiva0
+	ldx	#0
+	lda	sreg
+	beq	:+		; >=10
+	add	#'0'
+	sta	__cwd
+	inx
+:	lda	ptr1		; rem
+	add	#'0'
+	sta	__cwd,x
+	lda	#0
+	sta	__cwd+1,x
+	rts
+
+.endproc