diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index cdd617a..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-taskmanager-0.4.0-rc2.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..49e383d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-taskmanager-0.4.1.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 213b344..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-taskmanager
-# $Id$
-NAME := xfce4-taskmanager
-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 e217e62..f3c2268 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6111d36a743ecef817b5589f90a3f869  xfce4-taskmanager-0.4.0-rc2.tar.bz2
+4ed599faf6b734b2d2e7be16adf0b2d9  xfce4-taskmanager-0.4.1.tar.bz2
diff --git a/xfce4-taskmanager.desktop b/xfce4-taskmanager.desktop
deleted file mode 100644
index 196565f..0000000
--- a/xfce4-taskmanager.desktop
+++ /dev/null
@@ -1,52 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Xfce 4 Taskmanager
-GenericName=Taskmanager
-Comment=View current processes
-Comment[be]=Прагледзіць бягучыя працэсы
-Comment[bg]=Показване на текущите процеси
-Comment[bs]=Pregled trenutnih procesa
-Comment[ca]=Visualitza els processos actuals i l'estat
-Comment[cs]=Zobrazit aktuální procesy
-Comment[cy]=Gweld prosesau cyfredol
-Comment[da]=Vis aktive processer
-Comment[de]=Momentan laufende Prozesse anzeigen
-Comment[el]=Προβολή τρεχουσών διεργασιών
-Comment[en_CA]=View current processes
-Comment[en_GB]=View current processes
-Comment[es]=Ver los procesos actuales
-Comment[eu]=Ikusi uneko prozesuak
-Comment[fi]=Katsele aktiivisia prosesseja
-Comment[fr]=Affiche les processus en cours
-Comment[gl]=Ver procesos actuais
-Comment[hr]=Pregled trenutnih procesa
-Comment[hu]=A jelenlegi folyamatok megtekintése
-Comment[id]=Lihat proses yang
-Comment[it]=Mostra i processi correnti
-Comment[li]=Tuin huijig proses
-Comment[lt]=Parodo paleistus procesus
-Comment[lv]=Skatīt pašreizējos procesus
-Comment[mk]=Погледни ги моментално активните процеси
-Comment[ms]=Lihat proses semasa
-Comment[nb]=Vis aktive prosesser
-Comment[nl]=Toon de huidige processen
-Comment[no]=Vis aktive prosesser
-Comment[pl]=Wyświetla istniejące procesy
-Comment[pt]=Ver processos actuais
-Comment[pt_BR]=Exibe os processos atuais
-Comment[ro]=Arată procesele curente
-Comment[ru]=Программа для просмотра текущих процессов
-Comment[sk]=Zobrazuje aktuálne procesy
-Comment[sl]=Glej trenutne procese
-Comment[sq]=Shfaq proçeset aktualë
-Comment[sr]=Погледај тренутно покренуте процесе
-Comment[sr@Latn]=Pogledaj trenutno pokrenute procese
-Comment[sv]=Visa aktuella processer
-Comment[tr]=Çalışan süreçleri
-Exec=xfce4-taskmanager
-Icon=xfce4_xicon
-Terminal=false
-Type=Application
-StartupNotify=true
-X-Desktop-File-Install-Version=0.10
-OnlyShowIn=XFCE;
diff --git a/xfce4-taskmanager.spec b/xfce4-taskmanager.spec
index 54f7751..3cb5998 100644
--- a/xfce4-taskmanager.spec
+++ b/xfce4-taskmanager.spec
@@ -1,53 +1,71 @@
-Name:		xfce4-taskmanager
-Version:	0.4.0
-Release:	0.2.rc2%{?dist}
-Summary:	Taskmanager for the Xfce desktop environment
+Name:           xfce4-taskmanager
+Version:        0.4.1
+Release:        1%{?dist}
+Summary:        Taskmanager for the Xfce desktop environment
 
-Group:		User Interface/Desktops
-License:	GPL
-URL:		http://xfce4-taskmanager.nebulon.de
-Source0:	http://xfce4-taskmanager.nebulon.de/xfce4-taskmanager-0.4.0-rc2.tar.bz2
-Source1:	xfce4-taskmanager.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://goodies.xfce.org/projects/applications/%{name}
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils, perl(XML::Parser)
+BuildRequires:  libxfcegui4-devel >= 4.4
+BuildRequires:  gettext, desktop-file-utils, intltool
 
 %description
 A simple taskmanager for the Xfce desktop environment.
 
+
 %prep
-%setup -qn %{name}-%{version}-rc2
-# fix some permissons...
-chmod 0644 src/*.c
-chmod 0644 src/*.h
-chmod 0644 AUTHORS ChangeLog COPYING README TODO
+%setup -q
+# convert ChangeLog and THANKS to UTF-8 to make rpmlint happy
+iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog
+iconv -f ISO88591 -t UTF8 THANKS -o THANKS
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
-desktop-file-install --vendor fedora				\
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-	--add-category X-Fedora					\
-	--add-category Application				\
-	--add-category System					\
-	%{SOURCE1}
+desktop-file-install --vendor fedora                      \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+  --add-category GTK                                      \
+  --remove-category Application                           \
+  --delete-original                                       \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 
+
 %changelog
+* Tue Sep 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
+- Update to 0.4.1
+- Remove patches (fixed upstream)
+
+* Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+- Update to 0.4.0 stable which has finally been released
+- Add patch to fix 0%-CPU bug (rebased version of Enrico Tröger's patch)
+- Add patch to fix some compiler warnings (also based on Enrico's work)
+- Update license tag
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.4.0-0.3.rc2
+- Autorebuild for GCC 4.3
+
 * Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-0.2.rc2
 - Bump release for devel checkin.