diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 131009d..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-modplugxmms-2.05.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ddc51af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+modplugxmms-2.05.tar.gz
+xmms-modplug-2.05-archivers.patch
diff --git a/Makefile b/Makefile
deleted file mode 100644
index ac89726..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmms-modplug
-# $Id$
-NAME := xmms-modplug
-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/sources b/sources
index 88f953a..824be5e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 2dd9b88a02978d3001b48863b8cffc5b  modplugxmms-2.05.tar.gz
+ca28ee9780105ba66034aaecd890f1b7  xmms-modplug-2.05-archivers.patch
diff --git a/xmms-modplug.spec b/xmms-modplug.spec
index b3423c6..14ca259 100644
--- a/xmms-modplug.spec
+++ b/xmms-modplug.spec
@@ -2,13 +2,14 @@
 
 Name:           xmms-modplug
 Version:        2.05
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
 Group:          Applications/Multimedia
 URL:            http://modplug-xmms.sourceforge.net/
 Source:         http://dl.sf.net/modplug-xmms/modplugxmms-%{version}.tar.gz
+Patch0:         %{name}-2.05-archivers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xmms-devel
@@ -35,6 +36,7 @@ A command line mod player.
 
 %prep
 %setup -q -n modplugxmms-%{version}
+sed -e 's|"/usr/bin/uzip"|"/usr/bin/unzip"|' %{PATCH0} | patch -p1
 
 
 %build
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.05-8
+- Apply upstream patch to fix crash if some unarchivers are not found (#217195)
+
 * Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.05-7
 - Rebuild.