diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 36ff1c8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-websearch-plugin
-# $Id$
-NAME := xfce4-websearch-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/xfce4-websearch-plugin-20070428svn2704-desktop-file.patch b/xfce4-websearch-plugin-20070428svn2704-desktop-file.patch
new file mode 100644
index 0000000..c06ece4
--- /dev/null
+++ b/xfce4-websearch-plugin-20070428svn2704-desktop-file.patch
@@ -0,0 +1,15 @@
+--- src/websearch.desktop.in.in.orig	2009-07-04 01:08:31.000000000 +0200
++++ src/websearch.desktop.in.in	2009-07-04 01:35:04.000000000 +0200
+@@ -2,6 +2,10 @@
+ Type=X-XFCE-PanelPlugin
+ Encoding=UTF-8
+ _Name=WebSearch
++_Name[de]=Web-Suche
+ _Comment=Search the Web directly from the Panel
+-Icon=stock_find
+-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libwebsearch.so
++_Comment[de]=Das Internet direkt aus dem Panel heraus durchsuchen
++Icon=gtk-find
++X-XFCE-Module=websearch
++X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
++X-XFCE-Unique=false
diff --git a/xfce4-websearch-plugin.spec b/xfce4-websearch-plugin.spec
index 67edc73..1a12d88 100644
--- a/xfce4-websearch-plugin.spec
+++ b/xfce4-websearch-plugin.spec
@@ -1,6 +1,6 @@
 Name:		xfce4-websearch-plugin
 Version:	0.1.1
-Release:	0.10.20070428svn2704%{?dist}
+Release:	0.11.20070428svn2704%{?dist}
 Summary:	Websearch plugin from the XFCE panel
 
 Group:		User Interface/Desktops
@@ -11,7 +11,12 @@ URL:		http://goodies.xfce.org/
 # tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn2704.tar.bz2 xfce4-websearch-plugin
 Source0:	%{name}-20070428svn2704.tar.bz2
 #Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=505165
+# reported to upstream at http://bugzilla.xfce.org/show_bug.cgi?id=5455
 Patch0:		%{name}-20070428svn2704-multilib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=509294
+# not yet in Xfce bugzilla, because the websearch component is missing
+Patch1:		%{name}-20070428svn2704-desktop-file.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel
@@ -26,6 +31,7 @@ Access searchengines from the XFCE panel.
 %setup -qn %{name}
 ./autogen.sh
 %patch0 -b .multilib
+%patch1 -b .path
 
 %build
 %configure --disable-static
@@ -33,7 +39,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL="install -p"
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -47,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Jul 03 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.1-0.11.20070428svn2704
+- Fix path in desktop file (#509294)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.1-0.10.20070428svn2704
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild