diff --git a/.cvsignore b/.cvsignore
index 63d751d..21539e6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-verve-plugin-0.3.5.tar.bz2
+xfce4-verve-plugin-0.3.6.tar.bz2
diff --git a/sources b/sources
index bb2934e..e408566 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85701b960da6bb10762b460c23b84c15  verve-plugin-0.3.5.tar.bz2
+1dee60c7c4e11130226cab381fcb945c  xfce4-verve-plugin-0.3.6.tar.bz2
diff --git a/xfce4-verve-plugin.spec b/xfce4-verve-plugin.spec
index 78099d9..6f6e4d3 100644
--- a/xfce4-verve-plugin.spec
+++ b/xfce4-verve-plugin.spec
@@ -1,17 +1,17 @@
 Name:		xfce4-verve-plugin
-Version:	0.3.5
-Release:	6%{?dist}
+Version:	0.3.6
+Release:	1%{?dist}
 Summary:	A comfortable command line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
-URL:		http://goodies.xfce.org/projects/panel-plugins/verve-plugin
-Source0:	http://goodies.xfce.org/releases/verve-plugin/verve-plugin-%{version}.tar.bz2
+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.2, libxfcegui4-devel >= 4.3.0, exo-devel >= 0.3.1.3
-BuildRequires:	pcre-devel, dbus-glib-devel >= 0.34
-BuildRequires:	libxml2-devel, gettext, perl(XML::Parser)
+BuildRequires:	xfce4-panel-devel >=  4.4.0, libxfcegui4-devel >= 4.4.0, exo-devel >= 0.3.1.3
+BuildRequires:	pcre-devel >= 5.0, dbus-glib-devel >= 0.34
+BuildRequires:	libxml2-devel, gettext, intltool, perl(XML::Parser)
 Requires:	xfce4-panel >= 4.4.1
 Provides:	verve-plugin = %{version}
 # Retire xfce4-minicmd-plugin
@@ -30,7 +30,7 @@ more cool features, such as:
 
 
 %prep
-%setup -qn verve-plugin-%{version}
+%setup -q
 
 
 %build
@@ -41,14 +41,14 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang verve-plugin
+%find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f verve-plugin.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README THANKS TODO
 %{_libexecdir}/xfce4/panel-plugins/%{name}
@@ -56,24 +56,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/verve-focus
 
 %changelog
-* Thu Jul 10 2008 Christoph Wickert <fedora christoph-wickert de> - 0.3.5-6
+* Thu Nov 27 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.6-1
+- Update to 0.3.6
+- Remove "verve-plugin" provides because package name now matches upstream
+
+* Thu Jul 10 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.5-6
 - Obsolte the xfce4-minicmd-plugin
 
-* Wed Jun 11 2008 Christoph Wickert <fedora christoph-wickert de> - 0.3.5-5
+* Wed Jun 11 2008 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.5-5
 - BuildRequire dbus-glib-devel for all releases (#449438)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.3.5-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.5-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.5-3
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sun Apr 29 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.5-2
+* Sun Apr 29 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.5-2
 - Rebuild for Xfce 4.4.1
 
-* Sat Feb 24 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.5-1
+* Sat Feb 24 2007 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.5-1
 - Update to 0.3.5
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.4-1
+* Sat Sep 23 2006 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.4-1
 - Initial Fedora Extras version