diff --git a/H/Yap.h b/H/Yap.h
index d827740df..350e2c20e 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.3"
+#define YAP_VERSION "Yap-6.0.4"
 
 #define BIN_DIR "c:\\Yap\\bin"
 #define LIB_DIR "c:\\Yap\\lib\\Yap"
diff --git a/Makefile.in b/Makefile.in
index c5d24b221..45cc20211 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@ YAPLIB=@YAPLIB@
 #4.1VPATH=@srcdir@:@srcdir@/OPTYap
 CWD=$(PWD)
 #
-VERSION=6.0.3
+VERSION=6.0.4
 MYDDAS_VERSION=MYDDAS-0.9.1
 #
 
diff --git a/docs/yap.tex b/docs/yap.tex
index cea429e7e..b011c3196 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -8,7 +8,7 @@ a\input texinfo @c -*- mode: texinfo; coding: latin-1; -*-
 @c @setchapternewpage odd
 @c %**end of header
 
-@set VERSION 6.0.3
+@set VERSION 6.0.4
 @set EDITION 4.2.6
 @set UPDATED Feb 2010
 
diff --git a/misc/Yap.spec b/misc/Yap.spec
index f94c61afc..d7fd4e714 100644
--- a/misc/Yap.spec
+++ b/misc/Yap.spec
@@ -3,7 +3,7 @@
 
 Name: Yap
 Summary: Prolog Compiler
-Version: 6.0.3
+Version: 6.0.4
 Packager: Vitor Santos Costa <vitor@cos.ufrj.br>
 Release: 1
 Source: http://www.dcc.fc.up.pt/~vsc/Yap/%{name}-%{version}.tar.gz
@@ -11,7 +11,7 @@ License: Perl Artistic License
 Provides: yap
 Requires: readline
 Group: Development/Languages
-URL: http://www.ncc.up.pt/~vsc/Yap
+URL: http://www.dcc.fc.up.pt/~vsc/Yap
 Prefix: /usr
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
diff --git a/misc/yap.nsi b/misc/yap.nsi
index a00ba3687..2e0d9b5fa 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.3-installer.exe"
+outfile "yap-6.0.4-installer.exe"