diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e505e30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xmmsctrl-1.8.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index af5e5a6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmmsctrl
-# $Id$
-NAME := xmmsctrl
-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 e69de29..346b76c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0774f3e61cfc89c1fd3f0526c48b35db  xmmsctrl-1.8.tar.gz
diff --git a/xmmsctrl-no-strip.patch b/xmmsctrl-no-strip.patch
new file mode 100644
index 0000000..046f422
--- /dev/null
+++ b/xmmsctrl-no-strip.patch
@@ -0,0 +1,11 @@
+diff -rupN old/xmmsctrl-1.8/Makefile new/xmmsctrl-1.8/Makefile
+--- old/xmmsctrl-1.8/Makefile	2004-04-02 08:00:12.000000000 -0500
++++ new/xmmsctrl-1.8/Makefile	2008-09-23 00:48:36.000000000 -0400
+@@ -16,7 +16,6 @@ all : $(TARGET) HELP
+ 
+ $(TARGET) : xmmsctrl.c removefile.c
+ 	$(CC) -o $(TARGET) xmmsctrl.c removefile.c $(CFLAGS) $(LDFLAGS)
+-	strip xmmsctrl
+ 
+ HELP : xmmsctrl
+ 	./xmmsctrl > HELP || true
diff --git a/xmmsctrl.spec b/xmmsctrl.spec
new file mode 100644
index 0000000..f370c21
--- /dev/null
+++ b/xmmsctrl.spec
@@ -0,0 +1,61 @@
+Summary: Command line control utility for xmms
+Name: xmmsctrl
+Version: 1.8
+Release: 4%{?dist}
+URL: http://www.docs.uu.se/~adavid
+Source0: http://user.it.uu.se/~adavid/utils/%{name}-%{version}.tar.gz
+Patch0: xmmsctrl-no-strip.patch
+License: GPLv2
+Group: Applications/Multimedia
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: xmms
+BuildRequires: xmms-devel
+
+%description
+xmmsctrl is a small utility to control xmms from the command line. Its
+goal is to be used coupled with sh to test xmms state and perform an
+appropriate action, e.g. if playing then pause else play. The interest
+of this is to bind keys in a window manager to have control over xmms
+with keys that do play/next/pause, prev, control sound...
+
+%prep
+%setup -q
+%patch0 -p2 -b .nostrip
+chmod 0644 samples/*
+
+%build
+make %{?_smp_mflags} WARN="${RPM_OPT_FLAGS}"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
+install -m 755  %{name} ${RPM_BUILD_ROOT}/%{_bindir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc Changelog README HELP samples
+%{_bindir}/xmmsctrl
+
+%changelog
+* Sat Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-4
+- Changed the type of RPM_OPT_FLAGS from CFLAGS to WARN
+
+* Sat Sep 27 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-3
+- Added DistTag
+- Removed ExclusiveArch
+- Changed 0444 file permissions to 0644
+- Changed %%defattr to (-,root,root,-)
+- Honored Fedora specific compilation flags
+- Support parallel make
+
+* Mon Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.8-2
+- Repack for Fedora
+- Don't strip the binary patch
+
+* Mon Feb 18 2002 Jan IVEN <jan.iven@cern.ch> - 1.8-1
+- Initial build.
+
+