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 0f0b2dd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: amarokFS
-# $Id$
-NAME := amarokFS
-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/amarokFS-0.5-start_amarok.patch b/amarokFS-0.5-start_amarok.patch
index e2adc1d..d001b8e 100644
--- a/amarokFS-0.5-start_amarok.patch
+++ b/amarokFS-0.5-start_amarok.patch
@@ -18,7 +18,7 @@ diff -uNr amarokFS-0.5/amfs-xml.cpp amarokFS-0.5-mod/amfs-xml.cpp
  	progressBar = (QProgressBar *) 0;
  	cdcover = (QLabel *) 0;
  	gradient = (QLabel *) 0;
-@@ -439,6 +440,20 @@
+@@ -439,6 +440,21 @@
  	mouseTimer->start( 5000, TRUE );
  	
  	setMouseTracking(TRUE);
@@ -31,7 +31,8 @@ diff -uNr amarokFS-0.5/amfs-xml.cpp amarokFS-0.5-mod/amfs-xml.cpp
 +		} else {
 +			while (!dcopClient->isApplicationRegistered("amarok"))
 +				qApp->processEvents();
-+				usleep(100);
++				usleep(200);
++                       usleep(200);
 +			startedAmarok = true;
 +		}
 +		delete amarokProc;
diff --git a/amarokFS-0.5-theme_prev_button.patch b/amarokFS-0.5-theme_prev_button.patch
new file mode 100644
index 0000000..c3ba338
--- /dev/null
+++ b/amarokFS-0.5-theme_prev_button.patch
@@ -0,0 +1,12 @@
+diff -uNr amarokFS-0.5/theme.xml amarokFS-0.5-mod/theme.xml
+--- amarokFS-0.5/theme.xml	2007-05-02 22:51:07.000000000 +0200
++++ amarokFS-0.5-mod/theme.xml	2008-02-22 15:16:04.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ 	<button>
+ 		<path>images/player_start.png</path>
+-		<clicked>images/player_start.png</clicked>
++		<clicked>images/player_start2.png</clicked>
+ 		<command>prev()</command>
+ 		<x>920</x>
+ 		<y>100</y>
diff --git a/amarokFS.spec b/amarokFS.spec
index 1eb7b4a..5d291d3 100644
--- a/amarokFS.spec
+++ b/amarokFS.spec
@@ -1,6 +1,6 @@
 Name:           amarokFS
 Version:        0.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, nice looking full screen front-end for Amarok
 
 Group:          Applications/Multimedia
@@ -12,9 +12,10 @@ Source1:        http://www.kde-apps.org/CONTENT/content-files/53125-amarokFS-1.1
 Patch0:         amarokFS-0.5-fedora_paths.patch
 Patch1:         amarokFS-0.5-start_amarok.patch
 Patch2:         amarokFS-0.5-theme_howto.patch
+Patch3:         amarokFS-0.5-theme_prev_button.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel desktop-file-utils ImageMagick
+BuildRequires:  kdelibs3-devel desktop-file-utils ImageMagick
 Requires:       amarok
 
 %description
@@ -30,11 +31,9 @@ from within Amarok itself.
 %prep
 %setup -q
 %patch0 -p1 -b .fedora_paths
-#%patch1 -p1 -b .config_dialog_layout
-#%patch2 -p1 -b .large_cover_images
 %patch1 -p1 -b .start_amarok
 %patch2 -p1 -b .theme_howto
-#%patch5 -p1 -b .theme_prev_button
+%patch3 -p1 -b .theme_prev_button
 sed -i 's/Application;//' amarokFS.desktop
 sed -i 's/\/usr\/share\/icons\/amarokFS.png/amarokFS/' amarokFS.desktop
 chmod a-x amarokFS.png
@@ -88,6 +87,14 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Fri Feb 22 2008 Francois Aucamp <faucamp@fedoraproject.org> - 0.5-3
+- Changed kdelibs-devel build dependency to kdelibs3-devel (RHBZ #434093)
+- Fixed animation of "prev" button in default theme
+- Modified "start_amarok" patch to slow down dcop calls to amarok when starting (RHBZ #247712)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.5-2
+- Autorebuild for GCC 4.3
+
 * Thu Mar 29 2007 Francois Aucamp <faucamp@csir.co.za> - 0.5-1
 - Update to version 0.5
 - Removed "large_cover_images" patch; included upstream