diff --git a/.cvsignore b/.cvsignore
index c2b4daf..f7a2daa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libmodplug-0.8.tar.gz
+libmodplug-0.8.4.tar.gz
diff --git a/libmodplug-0.8-CVE-2006-4192.patch b/libmodplug-0.8-CVE-2006-4192.patch
deleted file mode 100644
index 24ee38e..0000000
--- a/libmodplug-0.8-CVE-2006-4192.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmodplug-0.8/src/sndfile.cpp~	2006-03-20 05:22:32.000000000 +0200
-+++ libmodplug-0.8/src/sndfile.cpp	2006-10-03 19:21:17.000000000 +0300
-@@ -1081,7 +1081,7 @@
- {
- 	UINT len = 0, mem = pIns->nLength+6;
- 
--	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
-+	if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0;
- 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
- 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
- 	if (nFlags & RSF_16BIT)
diff --git a/libmodplug-0.8.4-timiditypaths.patch b/libmodplug-0.8.4-timiditypaths.patch
new file mode 100644
index 0000000..9fbdbba
--- /dev/null
+++ b/libmodplug-0.8.4-timiditypaths.patch
@@ -0,0 +1,33 @@
+--- libmodplug-0.8.4/README~	2006-11-02 05:26:30.000000000 +0200
++++ libmodplug-0.8.4/README	2007-04-04 20:39:53.000000000 +0300
+@@ -57,7 +57,7 @@
+ 
+      MMPAT_PATH_TO_CFG	set to the directory where the file "timidity.cfg" and
+       the subdirectory "instruments" can be found,
+-       default: "/usr/local/share/timidity".
++       default: "/usr/share/timidity".
+       MMMID_SPEED for experimenting with the mod speed (1 thru 9)
+       MMMID_VERBOSE for feedback on the conversion process
+       MMMID_DEBUG for sake of completeness, only useful for maintainers
+@@ -68,7 +68,7 @@
+ 
+       MMPAT_PATH_TO_CFG	set to the directory where the file "timidity.cfg" and
+        the subdirectory "instruments" can be found,
+-       default: "/usr/local/share/timidity".
++       default: "/usr/share/timidity".
+ 
+       MMABC_NO_RANDOM_PICK when not set and the abc file contains multiple songs
+        (X:n) the first song to be played will be picked at random another click 
+--- libmodplug-0.8.4/src/load_pat.cpp~	2006-09-12 02:57:25.000000000 +0300
++++ libmodplug-0.8.4/src/load_pat.cpp	2007-04-04 20:40:13.000000000 +0300
+@@ -53,8 +53,8 @@
+ #define PATHFORPAT	"C:\\TIMIDITY\\INSTRUMENTS"
+ #else
+ #define DIRDELIM		'/'
+-#define TIMIDITYCFG	"/usr/local/share/timidity/timidity.cfg"
+-#define PATHFORPAT	"/usr/local/share/timidity/instruments"
++#define TIMIDITYCFG	"/etc/timidity.cfg"
++#define PATHFORPAT	"/usr/share/timidity/instruments"
+ #endif
+ 
+ #define PAT_ENV_PATH2CFG			"MMPAT_PATH_TO_CFG"
diff --git a/libmodplug.spec b/libmodplug.spec
index b2098d3..8d6fb3b 100644
--- a/libmodplug.spec
+++ b/libmodplug.spec
@@ -1,14 +1,14 @@
 Name:           libmodplug
-Version:        0.8
-Release:        3%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Modplug mod music file format library
 
 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}-0.8-CVE-2006-4192.patch
+Source0:        http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8.4-timiditypaths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1:0.8.4-1
+- 0.8.4.
+
 * Tue Oct  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:0.8-3
 - Apply patch for CVE-2006-4192 (from Debian).
 
diff --git a/sources b/sources
index a9ff753..dcdf5c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cea399626e2a074e2a77c8cd98387a48  libmodplug-0.8.tar.gz
+091bd1168a524a4f36fc61f95209e7e4  libmodplug-0.8.4.tar.gz