diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bceb4ec..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xorriso
-# $Id: Makefile,v 1.1 2009/07/06 04:06:10 kevin Exp $
-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 $$d/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/import.log b/import.log
deleted file mode 100644
index 45e43d9..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-xorriso-0_3_8-6_pl00_fc10:HEAD:xorriso-0.3.8-6.pl00.fc10.src.rpm:1246869750
diff --git a/sources b/sources
index 1c48941..7013ba2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d965bcca767995d1a8735cc34d44ebf4  xorriso-0.3.8.pl00.tar.gz
+5de9bb2d8bd0fab8998c407d9d8d9a09  xorriso-0.5.8.tar.gz
diff --git a/xorriso.spec b/xorriso.spec
index a5347ec..af65397 100644
--- a/xorriso.spec
+++ b/xorriso.spec
@@ -1,14 +1,14 @@
 %define		__patchlevel		pl00
 
 Name:		xorriso
-Version:	0.3.8
-Release:	7.%{__patchlevel}%{?dist}
+Version:	0.5.8
+Release:	1%{?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
+Source0:	http://scdbackup.sourceforge.net/%{name}-%{version}.tar.gz
 Source1:	xorriso_servicemenu.desktop
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:	coreutils util-linux-ng kde-filesystem
@@ -25,7 +25,6 @@ restore file objects from ISO 9660 filesystems.
 
 %prep
 %setup -q
-[ -s CONTRIBUTORS ] && exit 1
 
 
 %build
@@ -38,24 +37,40 @@ 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}`
+rm -f %{buildroot}%{_infodir}/dir
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
+
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info \
+    %{_infodir}/dir 2>/dev/null || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT README doc 
+%doc AUTHORS CONTRIBUTORS COPYING COPYRIGHT README doc 
 %{_bindir}/osirrox
 %{_bindir}/xorrecord
 %{_bindir}/xorriso
 %{_bindir}/xorrisofs
 %{_mandir}/man1/xorriso.1.gz
 %{_datadir}/kde4/services/ServiceMenus/xorriso_servicemenu.desktop
+%{_infodir}/%{name}.info.gz
 
 
 %changelog
+* Tue Jun 22 2010 Juha Tuomala <tuju@iki.fi> - 0.5.8-1
+- Update to 0.5.8.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.8-7.pl00
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild