diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 62d2970..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-timer-plugin-0.5.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5bc250e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-timer-plugin-0.6.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 997cb07..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-timer-plugin
-# $Id$
-NAME := xfce4-timer-plugin
-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 0ab9cf1..823eaa5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0036d3805cbe051d35e8ec595237e88c  xfce4-timer-plugin-0.5.1.tar.bz2
+ea50210f54922086c0cd836e3636cacd  xfce4-timer-plugin-0.6.tar.bz2
diff --git a/xfce4-timer-plugin.spec b/xfce4-timer-plugin.spec
index 5836be6..b75518e 100644
--- a/xfce4-timer-plugin.spec
+++ b/xfce4-timer-plugin.spec
@@ -1,6 +1,6 @@
 Name:		xfce4-timer-plugin
-Version:	0.5.1
-Release:	3%{?dist}
+Version:	0.6
+Release:	2%{?dist}
 Summary:	Timer for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -39,6 +39,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Dec 29 2007 Christoph Wickert <fedora christoph-wickert de> - 0.6-2
+- Bump release due to tag collision
+
+* Sat Dec 29 2007 Christoph Wickert <fedora christoph-wickert de> - 0.6-1
+- Update to 0.6
+
 * Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-3
 - Rebuild for BuildID feature
 - Update license tag