diff --git a/.cvsignore b/.cvsignore
index 836339a..7f4ac3b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xsp-2.6.tar.bz2
+xsp-2.6.4.tar.bz2
diff --git a/sources b/sources
index 9f5f318..eeae7dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48215067d6846971545d4294c65ee500  xsp-2.6.tar.bz2
+271886aa22cae93fd9cb75c9fe832391  xsp-2.6.4.tar.bz2
diff --git a/xsp.spec b/xsp.spec
index 9f8c324..2ff1162 100644
--- a/xsp.spec
+++ b/xsp.spec
@@ -1,13 +1,13 @@
-Name:     	xsp
-Version: 	2.6
-Release:	2%{?dist}
+Name:		xsp
+Version:	2.6.4
+Release:	1%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:		http://mono.ximian.com/monobuild/preview/sources-preview/
-Source0:	%{name}-%{version}.tar.bz2
-BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.6, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+URL:		http://www.mono-project.com/Main_Page
+Source0:	http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
+BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.6.4, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
 BuildRequires:	mono-jscript, mono-data-oracle
-Requires:	mono-core >= 2.6
+Requires:	mono-core >= 2.6.4
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha
@@ -41,14 +41,13 @@ Files for testing the xsp server
 find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
        -or -name \*.make -or -name \*.in \
        | while read f ;
-         do
-
-	   sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
-	   sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
-           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
-	   sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
-         done
+	do
+		sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
+		sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+		sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
+		sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
+		sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
+	done
 
 autoreconf
 
@@ -64,7 +63,7 @@ make DESTDIR=%{buildroot} install
 rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root,-)
+%defattr(-,root,root,-)
 %doc NEWS README COPYING
 %{_bindir}/asp*
 %{_bindir}/dbsessmgr*
@@ -88,14 +87,20 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fastcgi-mono-server*
 
 %files devel
+%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/xsp*
 
 %files tests
+%defattr(-,root,root,-)
 %{_libdir}/xsp/1.0
 %{_libdir}/xsp/2.0
 %{_libdir}/xsp/test
 
 %changelog
+* Mon Jun 21 2010 Christian Krause <chkr@fedoraproject.org> - 2.6.4-1
+- Bump to 2.6.4 release
+- Spec file fixes
+
 * Tue Dec 22 2009 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.6-2
 - Bump to release version