diff --git a/H/Yap.h b/H/Yap.h
index c17646a61..dedf68d3f 100644
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -90,7 +90,7 @@
 #undef  USE_THREADED_CODE
 #endif
 #define inline __inline
-#define YAP_VERSION "Yap-6.0.4"
+#define YAP_VERSION "Yap-6.0.5"
 
 #define BIN_DIR "c:\\Yap\\bin"
 #define LIB_DIR "c:\\Yap\\lib\\Yap"
diff --git a/Makefile.in b/Makefile.in
index d087fb728..78620cd27 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@ YAPLIB=@YAPLIB@
 #4.1VPATH=@srcdir@:@srcdir@/OPTYap
 CWD=$(PWD)
 #
-VERSION=6.0.4
+VERSION=6.0.5
 MYDDAS_VERSION=MYDDAS-0.9.1
 #
 
diff --git a/docs/yap.tex b/docs/yap.tex
index 053912ebd..3418a9367 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -8,9 +8,9 @@
 @c @setchapternewpage odd
 @c %**end of header
 
-@set VERSION 6.0.4
-@set EDITION 4.2.6
-@set UPDATED Feb 2010
+@set VERSION 6.0.5
+@set EDITION 4.2.7
+@set UPDATED May 2010
 
 @c Index for C-Prolog compatible predicate
 @defindex cy
diff --git a/library/yap2swi/yap2swi.c b/library/yap2swi/yap2swi.c
index 32e3d622d..eee8a3f1f 100755
--- a/library/yap2swi/yap2swi.c
+++ b/library/yap2swi/yap2swi.c
@@ -400,7 +400,7 @@ X_API int PL_get_chars(term_t l, char **sp, unsigned flags)
       putc_cur_lim = tmp+(BUF_SIZE-1);
     }
     Yap_plwrite(t, do_yap_putc, write_flags, 1200);
-    *putc_cur_buf = '\0';
+    *putc_curp = '\0';
     /* may have changed due to overflows */
     *sp = putc_cur_buf;
     return TRUE;
diff --git a/misc/yap.nsi b/misc/yap.nsi
index 2e0d9b5fa..bee49b555 100755
--- a/misc/yap.nsi
+++ b/misc/yap.nsi
@@ -268,4 +268,4 @@ Function .onInstFailed
 		    installer, please contact yap-users@sf.net"
 FunctionEnd
 
-outfile "yap-6.0.4-installer.exe"
+outfile "yap-6.0.5-installer.exe"