diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 49e383d..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-taskmanager-0.4.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2fab4f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-taskmanager-1.0.0.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 f3c2268..b9709d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ed599faf6b734b2d2e7be16adf0b2d9  xfce4-taskmanager-0.4.1.tar.bz2
+cd205366ae771d2cbe72b5ca7b1257b0  xfce4-taskmanager-1.0.0.tar.bz2
diff --git a/xfce4-taskmanager.spec b/xfce4-taskmanager.spec
index 43bbb1b..ef8005b 100644
--- a/xfce4-taskmanager.spec
+++ b/xfce4-taskmanager.spec
@@ -1,12 +1,14 @@
+%global majorversion 1.0
+
 Name:           xfce4-taskmanager
-Version:        0.4.1
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Taskmanager for the Xfce desktop environment
 
 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
+Source0:        http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4
@@ -18,12 +20,6 @@ A simple taskmanager for the Xfce desktop environment.
 
 %prep
 %setup -q
-# convert ChangeLog and THANKS to UTF-8 to make rpmlint happy
-for file in ChangeLog THANKS; do
-    mv $file timestamp
-    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
-    touch -r timestamp $file
-done
 
 
 %build
@@ -41,7 +37,6 @@ desktop-file-install --vendor fedora                      \
   --add-category GTK                                      \
   --add-category Monitor                                  \
   --add-category X-Xfce                                   \
-  --remove-category Application                           \
   --remove-category Utility                               \
   --delete-original                                       \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
@@ -59,6 +54,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 15 2010 Christoph Wickert <cwickert@fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0 final
+
+* Sun Jun 06 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.92-1
+- Update to 0.5.91 (0.6 Beta 3)
+
+* Tue May 25 2010 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.91-1
+- Update to 0.5.91 (0.6 Beta 2)
+
 * Thu Jul 30 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild