diff --git a/mapserver-6.0.0-beta1.tar.bz2 b/mapserver-6.0.0-beta1.tar.bz2
new file mode 100644
index 0000000..b6421c0
--- /dev/null
+++ b/mapserver-6.0.0-beta1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cbfd5129e5dca5ad69a74e2df809ae0606c64fe879f50996957f2a81e43474a
+size 1920862
diff --git a/mapserver-6.0.0-beta1.tar.gz b/mapserver-6.0.0-beta1.tar.gz
deleted file mode 100644
index df67e57..0000000
--- a/mapserver-6.0.0-beta1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:645981350db1a82e8048c6b894b2b7b0feaf179eac029e6a4a516c549ca13400
-size 2439764
diff --git a/mapserver.spec b/mapserver.spec
index bfea7b3..93fce74 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -1,9 +1,10 @@
 Name:           mapserver
-Version:        6.0.0-beta1
+%define fileversion 6.0.0-beta1
+Version:        6.0.0_beta1
 Release:        1
 License:        BSD
 Group:          Applications/GIS
-Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{fileversion}.tar.bz2
 URL:            http://mapserver.gis.umn.edu
 Summary:        Environment for building spatially-enabled internet applications
 Packager:       Stephan Holl <stephan.holl@intevation.de> 
@@ -22,6 +23,7 @@ BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  mysql-devel
+BuildRequires:  giflib-devel
 BuildRequires:  libgeos-devel
 BuildRequires:  libproj-devel
 BuildRequires:  libgdal-devel
@@ -59,13 +61,13 @@ BuildRequires:  java-1_5_0-ibm-alsa
 BuildRequires:  krb5-devel
 %endif
 BuildRequires:  libgcj-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch0:          mapserver-5.4.1_buildchecks.patch
 #Patch1:          hidden_layer.patch
 #Patch2:          bug3525_verbose_output.patch
 
 %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-%define		_cgibindir /srv/www/cgi-bin
+%define _cgibindir /srv/www/cgi-bin
 
 %description
 Mapserver is an internet mapping program that converts GIS data to
@@ -76,7 +78,7 @@ custom GIS data.
 %package -n php-mapserver
 Summary:        PHP/Mapscript map making extensions to PHP
 Group:          Development/Languages
-Requires:       php-gd 
+Requires:       php-gd
 Requires:       apache2
 Requires:       apache2-mod_php5
 
@@ -111,7 +113,7 @@ The Java/Mapscript extension provides full map customization capabilities
 within the Java programming language.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{fileversion}
 %patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
@@ -119,13 +121,13 @@ within the Java programming language.
 # fix spurious perm bits
 chmod -x tests/home.png
 chmod -x mappluginlayer.c
-chmod -x mapscript/php3/mapscript_i.c
-chmod -x mapscript/php3/Makefile.in
-chmod -x mapscript/php3/Makefile.vc
-chmod -x mapscript/php3/php_mapscript.*
+chmod -x mapscript/php/mapscript_i.c
+chmod -x mapscript/php/Makefile.in
+chmod -x mapscript/php/Makefile.vc
+chmod -x mapscript/php/php_mapscript.*
 chmod -x mapscript/python/examples/*.py
 chmod -x mapscript/perl/examples/*.pl
-chmod -x mapscript/php3/README.WIN32
+chmod -x mapscript/php/README.WIN32
 
 %build
 
@@ -202,7 +204,7 @@ install -p -m 755 shptree %{buildroot}/%{_bindir}
 install -p -m 755 sortshp %{buildroot}/%{_bindir}
 install -p -m 755 tile4ms %{buildroot}/%{_bindir}
 
-install -p -m 755 mapscript/php3/php_mapscript.so %{buildroot}/%{_libdir}/php5/extensions/
+install -p -m 755 mapscript/php/php_mapscript.so %{buildroot}/%{_libdir}/php5/extensions/
 
 # install perl module
 pushd mapscript/perl
@@ -259,9 +261,9 @@ rm -rf %{buildroot}
 
 %files -n php-mapserver
 %defattr(-,root,root)
-%doc mapscript/php3/README
-%doc mapscript/php3/README.WIN32
-%doc mapscript/php3/examples
+%doc mapscript/php/README
+%doc mapscript/php/README.WIN32
+%doc mapscript/php/examples
 %config(noreplace) %{_sysconfdir}/php5/conf.d/%{name}.ini
 %{_libdir}/php5/extensions/php_mapscript.so