diff --git a/.cvsignore b/.cvsignore
index 3d14494..c2b4daf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libmodplug-0.7.tar.gz
+libmodplug-0.8.tar.gz
diff --git a/libmodplug-64bit.patch b/libmodplug-64bit.patch
deleted file mode 100644
index 78ca7c3..0000000
--- a/libmodplug-64bit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- libmodplug/src/libmodplug/stdafx.h
-+++ libmodplug/src/libmodplug/stdafx.h
-@@ -31,21 +31,31 @@
- typedef unsigned char UCHAR;
- typedef unsigned char* PUCHAR;
- typedef unsigned short USHORT;
-+#if defined(_LP64)
-+typedef unsigned int ULONG;
-+typedef unsigned int UINT;
-+typedef unsigned int DWORD;
-+typedef int LONG;
-+typedef long LONGLONG;
-+typedef int * LPLONG;
-+typedef unsigned int * LPDWORD;
-+#else
- typedef unsigned long ULONG;
- typedef unsigned long UINT;
- typedef unsigned long DWORD;
- typedef long LONG;
-+typedef long long LONGLONG;
-+typedef long * LPLONG;
-+typedef unsigned long * LPDWORD;
-+#endif
- typedef unsigned short WORD;
- typedef unsigned char BYTE;
- typedef unsigned char * LPBYTE;
- typedef bool BOOL;
- typedef char * LPSTR;
- typedef void *  LPVOID;
--typedef long * LPLONG;
--typedef unsigned long * LPDWORD;
- typedef unsigned short * LPWORD;
- typedef const char * LPCSTR;
--typedef long long LONGLONG;
- typedef void * PVOID;
- typedef void VOID;
- 
diff --git a/libmodplug.spec b/libmodplug.spec
index 0bef9a0..5318150 100644
--- a/libmodplug.spec
+++ b/libmodplug.spec
@@ -1,6 +1,6 @@
 Name:           libmodplug
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
@@ -8,7 +8,6 @@ Group:          System Environment/Libraries
 License:        Public Domain
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz
-Patch0:         %{name}-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -26,7 +25,7 @@ Requires:       pkgconfig
 
 %prep
 %setup -q
-%patch0 -p1
+chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h
 sed -i -e 's/\r//g' ChangeLog
 
 
@@ -50,6 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:0.8-1
+- 0.8, 64bit patch included upstream.
+
 * Mon Feb 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:0.7-5
 - Rebuild, cosmetics.
 
diff --git a/sources b/sources
index f8fee3c..a9ff753 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6e7412f90cdd4a27a2dd3de94909905  libmodplug-0.7.tar.gz
+cea399626e2a074e2a77c8cd98387a48  libmodplug-0.8.tar.gz