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..9c830dd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xorriso-0.3.8.pl00.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d799943..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xorriso
-# $Id$
-NAME := xorriso
-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..1c48941 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d965bcca767995d1a8735cc34d44ebf4  xorriso-0.3.8.pl00.tar.gz
diff --git a/xorriso.spec b/xorriso.spec
new file mode 100644
index 0000000..9fac05f
--- /dev/null
+++ b/xorriso.spec
@@ -0,0 +1,75 @@
+%define		__patchlevel		pl00
+
+Name:		xorriso
+Version:	0.3.8
+Release:	6.%{__patchlevel}%{?dist}
+Summary:	ISO 9660 image manipulation tool
+
+Group:		Applications/Archiving
+License:	GPLv2 and GPL+ and LGPLv2+
+URL:		http://scdbackup.sourceforge.net/xorriso_eng.html	
+Source0:	http://scdbackup.sourceforge.net/%{name}-%{version}.%{__patchlevel}.tar.gz
+Source1:	xorriso_servicemenu.desktop
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires:	coreutils util-linux-ng kde-filesystem
+
+
+%description
+xorriso is a program which maps file objects from POSIX compliant
+filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows
+session-wise manipulation of such filesystems. It can load the management
+information of existing ISO images and it writes the session results to
+optical media or to filesystem objects. Vice versa xorriso is able to 
+restore file objects from ISO 9660 filesystems.
+
+
+%prep
+%setup -q
+[ -s CONTRIBUTORS ] && exit 1
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+rm -rf %{buildroot}/%{_libdir}/pkgconfig/xorriso.pc
+install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/`basename %{SOURCE1}`
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYRIGHT README doc 
+%{_bindir}/osirrox
+%{_bindir}/xorrecord
+%{_bindir}/xorriso
+%{_bindir}/xorrisofs
+%{_mandir}/man1/xorriso.1.gz
+%{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop
+
+
+%changelog
+* Sat Jun 12 2009 Juha Tuomala <tuju@iki.fi> - 0.3.8-6.pl00
+- Minor spec edits.
+
+* Sat Jun 12 2009 Juha Tuomala <tuju@iki.fi> - 0.3.8-5.pl00
+- Minor spec edits.
+
+* Fri Jun 12 2009 Juha Tuomala <tuju@iki.fi> - 0.3.8-4.pl00
+- Fixed license string, minor spec cleanups.
+
+* Fri Jun 12 2009 Juha Tuomala <tuju@iki.fi> - 0.3.8-3.pl00
+- Added desktop entry for KDE.
+
+* Fri Jun 12 2009 Juha Tuomala <tuju@iki.fi> - 0.3.8-2.pl00
+- Fixed multiple (review #505184).
+
+* Wed Jun 10 2009 Juha Tuomala <tuju@iki.fi> - 0.3.8-1.pl00
+- Initial package.
diff --git a/xorriso_servicemenu.desktop b/xorriso_servicemenu.desktop
new file mode 100644
index 0000000..8eba267
--- /dev/null
+++ b/xorriso_servicemenu.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Service
+ServiceTypes=KonqPopupMenu/Plugin
+MimeType=application/x-cd-image;
+Actions=xorrisoExtractHere;
+X-KDE-Priority=TopLevel
+X-KDE-StartupNotify=false
+
+[Desktop Action xorrisoExtractHere]
+Name=Xorriso: extract ISO-image here
+Name[fi]=Xorriso: Pura ISO tiedosto tähän
+Icon=media-optical
+Exec=/bin/nice -n 19 ionice -n7 -c3 xorriso -indev "%F" -osirrox on -cp_rx "*" "$(/usr/bin/dirname %F)"
+