diff --git a/srcpkgs/gettext/gettext-devel.template b/srcpkgs/gettext/gettext-devel.template
index dd6e8f7d111..4625e72eaef 100644
--- a/srcpkgs/gettext/gettext-devel.template
+++ b/srcpkgs/gettext/gettext-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'gettext-devel'.
 #
+noarch=yes
 depends="gettext-libs>=${version}"
 short_desc="${short_desc} (development files)"
 
 do_install() {
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/doc/gettext ${DESTDIR}/usr/share/doc
-	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/gettext ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/share/doc/gettext usr/share/doc
+	vmove usr/share/aclocal usr/share
+	vmove usr/share/gettext usr/share
 }
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 12580096708..bb1a85f496a 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,11 +1,12 @@
 # Template build file for 'gettext'.
 pkgname=gettext
 version=0.18.2
-revision=1
+revision=2
 subpackages="${pkgname}-devel ${pkgname}-libs"
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
- --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs"
+ --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
+ --disable-static"
 makedepends="ncurses-devel libgomp-devel glib-devel libxml2-devel
  libcroco-devel acl-devel"
 short_desc="Internationalized Message Handling Library and tools"