diff --git a/srcpkgs/garcon/garcon-devel.template b/srcpkgs/garcon/garcon-devel.template
index f28cf2bdf2..1e32a6bb69 100644
--- a/srcpkgs/garcon/garcon-devel.template
+++ b/srcpkgs/garcon/garcon-devel.template
@@ -1,15 +1,14 @@
 # Template file for 'garcon-devel'.
 #
-depends="pkg-config glib-devel garcon>=0.2.0"
+noarch=yes
+depends="glib-devel ${sourcepkg}-${version}_${revision}"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/garcon/garcon.rshlibs b/srcpkgs/garcon/garcon.rshlibs
index 2258657158..37ab18acda 100644
--- a/srcpkgs/garcon/garcon.rshlibs
+++ b/srcpkgs/garcon/garcon.rshlibs
@@ -1,7 +1,5 @@
 libgio-2.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index d56b5af7b8..7a8913027f 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,14 +1,15 @@
 # Template file for 'garcon'
 pkgname=garcon
 version=0.2.0
-distfiles="http://archive.xfce.org/src/xfce/garcon/0.2/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
+configure_args="--disable-static"
 makedepends="pkg-config intltool glib-devel libxfce4util-devel"
-revision=1
 short_desc="Glib/GIO freedesktop.org compliant menu implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://wiki.xfce.org/dev/garcon"
 license="LGPL-2.1"
+distfiles="http://archive.xfce.org/src/xfce/garcon/0.2/$pkgname-$version.tar.bz2"
 checksum=02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c
 long_desc="
  This is garcon, a freedesktop.org compliant menu implementation based
@@ -19,4 +20,3 @@ long_desc="
 
 conf_files="/etc/xdg/menus/xfce-applications.menu"
 subpackages="$pkgname-devel"
-