diff --git a/libsrc/common/_cwd.s b/libsrc/common/_cwd.s
index b0c48e756..eb3647aac 100644
--- a/libsrc/common/_cwd.s
+++ b/libsrc/common/_cwd.s
@@ -1,15 +1,23 @@
 ;
-; Ullrich von Bassewitz, 2003-08-12
+; Ullrich von Bassewitz, 2003-08-12, 2005-04-16
 ;
 ; Place to store the current working directory.
-; NOTE: Some of the code working with directories is not able to handle 
+; NOTE: Some of the code working with directories is not able to handle
 ; strings longer than 255 chars, so don't make __cwd_buf_size larger than 256
 ; without checking the other sources.
+;
+; __cwd is initialized by a platform specific function named "initcwd" called
+; by the constructor defined in this module.
+;
 
        	.export		__cwd
         .export         __cwd_buf_size
+        .constructor    cwd_init
+
+        .import         initcwd
 
         __cwd_buf_size  = 64
+        cwd_init        := initcwd
 
 .bss