diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f2626ed..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-notes-plugin-1.7.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e87ea18
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-notes-plugin-1.7.4.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 a106a4b..34de72a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6d27d8c566fbd98a14bd59273da0adf  xfce4-notes-plugin-1.7.1.tar.bz2
+47bd8d19d807a471d9d4d09db2ebafb6  xfce4-notes-plugin-1.7.4.tar.bz2
diff --git a/xfce4-notes-plugin-1.7.3-dsofix.patch b/xfce4-notes-plugin-1.7.3-dsofix.patch
new file mode 100644
index 0000000..313845d
--- /dev/null
+++ b/xfce4-notes-plugin-1.7.3-dsofix.patch
@@ -0,0 +1,11 @@
+--- xfce4-notes-plugin-1.7.3.orig/src/Makefile.in	2010-03-27 09:36:43.000000000 +0100
++++ xfce4-notes-plugin-1.7.3/src/Makefile.in	2010-03-27 12:31:56.000000000 +0100
+@@ -210,7 +210,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec
index e052b79..6974e37 100644
--- a/xfce4-notes-plugin.spec
+++ b/xfce4-notes-plugin.spec
@@ -1,5 +1,5 @@
 Name:		xfce4-notes-plugin
-Version:	1.7.1
+Version:	1.7.4
 Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
@@ -7,12 +7,14 @@ Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2
+Patch0:		xfce4-notes-plugin-1.7.3-dsofix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
 BuildRequires:	xfconf-devel >= 4.6.0
-BuildRequires:	gettext, intltool, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.4.1, xfconf >= 4.6.0
+BuildRequires:	unique-devel
+BuildRequires:	gettext, intltool, desktop-file-utils
+Requires:	xfce4-panel >= 4.4.1, xfconf >= 4.6.0, exo
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -23,17 +25,22 @@ background color and much more.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dsofix
 
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+V=1 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_datadir}/applications/xfce4-notes.desktop
 
 
 %clean
@@ -58,15 +65,33 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
+%{_bindir}/xfce4-notes
+%{_bindir}/xfce4-popup-notes
 %{_bindir}/xfce4-notes-settings
 %{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/applications/xfce4-notes.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_bindir}/xfce4-popup-notes
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/%{name}/
 
 
 %changelog
+* Mon Mar 29 2010 Mar 27 2010 Christoph Wickert <cwickert@fedoraproject.org> - 1.7.4-1
+- Update to 1.7.4
+- Use exo-open to open URLs (#577548)
+
+* Sat Mar 27 2010 Christoph Wickert <cwickert@fedoraproject.org> - 1.7.3-1
+- Update to 1.7.3
+
+* Wed Feb 17 2010 Christoph Wickert <cwickert@fedoraproject.org> - 1.7.2-2
+- Add patch to fix DSO linking (#565043)
+
+* Sun Dec 20 2009 Christoph Wickert <cwickert@fedoraproject.org> - 1.7.2-1
+- Update to 1.7.2
+- New build dep: unique-devel
+
 * Fri Sep 04 2009 Christoph Wickert <cwickert@fedoraproject.org> - 1.7.1-1
 - Update to 1.7.1