diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index d809853..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-liquidwar-5.6.3.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4e04d62
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+liquidwar-5.6.4.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b308eb0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: liquidwar
-# $Id$
-NAME := liquidwar
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/liquidwar.spec b/liquidwar.spec
index 9c83097..4bac175 100644
--- a/liquidwar.spec
+++ b/liquidwar.spec
@@ -1,6 +1,6 @@
 Name:           liquidwar
-Version:        5.6.3
-Release:        4%{?dist}
+Version:        5.6.4
+Release:        2%{?dist}
 Summary:        Multiplayer wargame with liquid armies
 Group:          Amusements/Games
 License:        GPLv2+
@@ -48,7 +48,7 @@ This package contains the server for hosting network LiquidWar games.
 %prep
 %setup -q
 # don't strip the binaries please 
-sed -i 's/install -s/install/g' Makefile.in
+sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in
 # fix manpage doc reference
 sed -i \
   -e 's:^\.B /usr/share/doc/liquidwar $:\.B %{_docdir}/%{name}-doc-%{version}:' \
@@ -56,18 +56,23 @@ sed -i \
   -e 's:^\.B /usr/local/share/doc/liquidwar$:the %{name}-doc :' \
   -e 's:^directories, :package), :' \
   doc/man/begin.man.in
-# fix metaserer url
-sed -i 's#http://www.ufoot.org/liquidwar/metaserver.php3#http://www.ufoot.org/liquidwar/v5/metaserver#g' \
-  doc/xml/*.xml
+# fix README.* encoding
+for i in de dk fr; do
+  iconv -f ISO-8859-1 -t UTF8 README.$i > $i
+  mv $i README.$i
+done
 
 
 %build
-%configure \
+%configure --disable-target-opt \
 %ifnarch %{ix86}
   --disable-asm
 %endif
 
-make %{?_smp_mflags} GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}
+MAKE_FLAGS="DEBUG_FLAGS= GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}"
+# to show to compile flags with out MAKE_FLAGS
+make config $MAKE_FLAGS
+make %{?_smp_mflags} $MAKE_FLAGS
 
 # make docs utf-8
 iconv -f ISO-8859-1 -t UTF8 doc/man/%{name}.6 | gzip > doc/man/%{name}.6.gz
@@ -175,6 +180,13 @@ fi
 
 
 %changelog
+* Wed Dec 12 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.6.4-2
+- Fix generation of debuginfo package (bz 413081) 
+- Fix encoding of README.* files
+
+* Mon Oct 22 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.6.4-1
+- New upstream release 5.6.4
+
 * Mon Aug 13 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.6.3-4
 - Update License tag for new Licensing Guidelines compliance
 
diff --git a/sources b/sources
index 53eaddb..e98542f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a41473c281f214c1ac96ab50f98537c9  liquidwar-5.6.3.tar.gz
+6917dd1026e6685404ffbd086f8ba374  liquidwar-5.6.4.tar.gz