diff --git a/srcpkgs/ORBit2/template b/srcpkgs/ORBit2/template
index b3571e27cf..77047f1e4e 100644
--- a/srcpkgs/ORBit2/template
+++ b/srcpkgs/ORBit2/template
@@ -1,8 +1,9 @@
 # Template file for 'ORBit2'
 pkgname=ORBit2
 version=2.14.19
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel libIDL-devel"
 short_desc="Thin/fast CORBA ORB"
@@ -12,6 +13,10 @@ homepage="http://projects.gnome.org/ORBit2/"
 distfiles="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/2.14/${pkgname}-${version}.tar.bz2"
 checksum=55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
 
+post_install() {
+	rm -f ${DESTDIR}/usr/lib/*.a
+}
+
 libORBit2_package() {
 	short_desc+=" - Runtime library"
 	pkg_install() {
@@ -19,17 +24,16 @@ libORBit2_package() {
 		vmove "usr/lib/orbit-2.0/*.so*"
 	}
 }
-
 ORBit2-devel_package() {
-	depends="libglib-devel libIDL-devel libORBit2>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/orbit-2.0/*.a"
+		vmove usr/bin/orbit2-config
+		vmove usr/lib/*.so
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/share/idl
 		vmove usr/share/aclocal
+		vmove usr/share/gtk-doc
 	}
 }