diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 90852e3..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-quicklauncher-plugin-1.9.2.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bfa9ca7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-quicklauncher-plugin-1.9.4.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d6dbdee..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-quicklauncher-plugin
-# $Id$
-NAME := xfce4-quicklauncher-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 071a9d1..48b677a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64353ee9f32f891f198297937454307b  xfce4-quicklauncher-plugin-1.9.2.tar.bz2
+299e17f196ecfa5fb018cf65abb19b56  xfce4-quicklauncher-plugin-1.9.4.tar.bz2
diff --git a/xfce4-quicklauncher-plugin-1.9.2-multilib.patch b/xfce4-quicklauncher-plugin-1.9.2-multilib.patch
new file mode 100644
index 0000000..4651d85
--- /dev/null
+++ b/xfce4-quicklauncher-plugin-1.9.2-multilib.patch
@@ -0,0 +1,11 @@
+--- panel-plugin/Makefile.in.orig	2007-06-09 13:43:52.000000000 +0200
++++ panel-plugin/Makefile.in	2007-06-09 13:44:30.000000000 +0200
+@@ -271,7 +271,7 @@
+ # additional level of indirection: a <name>.desktop.in.in file.
+ desktop_in_in_files = quicklauncher.desktop.in.in
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+-desktopdir = $(datadir)/xfce4/panel-plugins
++desktopdir = $(libdir)/xfce4/panel-plugins
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ EXTRA_DIST = \
+ 	$(desktop_in_in_files)
diff --git a/xfce4-quicklauncher-plugin.spec b/xfce4-quicklauncher-plugin.spec
index a4fa2ea..adda382 100644
--- a/xfce4-quicklauncher-plugin.spec
+++ b/xfce4-quicklauncher-plugin.spec
@@ -1,12 +1,13 @@
 Name:		xfce4-quicklauncher-plugin
-Version:	1.9.2
-Release:	3%{?dist}
+Version:	1.9.4
+Release:	1%{?dist}
 Summary:	Quicklauncher 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
+Patch0:		%{name}-1.9.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -19,6 +20,7 @@ them on several lines.
 
 %prep
 %setup -q
+%patch0 -b .multilib
 
 %build
 %configure --disable-static
@@ -37,9 +39,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
 %{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.4-1
+- Update to 1.9.4
+- Update license tag
+
+* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-4
+- Multilib fix for desktop file (#228168)
+
 * Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-3
 - Rebuild for Xfce 4.4.1