diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 79e7134..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-notes-plugin-1.4.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..06fe2ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-notes-plugin-1.6.1.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c810457..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-notes-plugin
-# $Id$
-NAME := xfce4-notes-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 2e9f75e..93f7d0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f20d84bf3aadd6c974f226c04f33050  xfce4-notes-plugin-1.4.1.tar.bz2
+be2e9006e2a033c722243e4afc1cfc2a  xfce4-notes-plugin-1.6.1.tar.bz2
diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec
index 3279f0d..bd4b6c7 100644
--- a/xfce4-notes-plugin.spec
+++ b/xfce4-notes-plugin.spec
@@ -1,17 +1,18 @@
 Name:		xfce4-notes-plugin
-Version:	1.4.1
-Release:	2%{?dist}
+Version:	1.6.1
+Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.1, libxfcegui4-devel >= 4.3.90.1, libxml2-devel
-BuildRequires:	libXt-devel, gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.4.0
+BuildRequires:	Thunar-devel >= 0.8.0
+BuildRequires:	gettext, perl(XML::Parser)
+Requires:	xfce4-panel >= 4.4.1
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -52,6 +53,20 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %changelog
+* Sat Dec 29 2007 Christoph Wickert <fedora christoph-wickert de> - 1.6.1-1
+- Update to 1.6.1
+- BR Thunar-devel for new file system monitoring feature
+
+* Fri Dec 07 2007 Christoph Wickert <fedora christoph-wickert de> - 1.6.0-2
+- Rebuild for Xfce 4.4.2
+
+* Sat Nov 24 2007 Christoph Wickert <fedora christoph-wickert de> - 1.6.0-1
+- Update to 1.6.0
+
+* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 1.4.1-3
+- Rebuild for BuildID feature
+- Update license tag
+
 * Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.4.1-2
 - Rebuild for Xfce 4.4.1