diff --git a/srcpkgs/abiword/abiword-devel.template b/srcpkgs/abiword/abiword-devel.template
index d4abdf9ef53..1759d4b4390 100644
--- a/srcpkgs/abiword/abiword-devel.template
+++ b/srcpkgs/abiword/abiword-devel.template
@@ -1,6 +1,8 @@
 # Template file for 'abiword-devel'.
 #
-depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel librsvg-devel libabiword>=$version"
+noarch=yes
+depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel
+ librsvg-devel libabiword>=${version}"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
@@ -9,6 +11,4 @@ long_desc="${long_desc}
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-	vmove "usr/lib/abiword-2.8/plugins/*.a" usr/lib/abiword-2.8/plugins
 }
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index 5cf9d1d1275..7fe99e31cf2 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -1,21 +1,22 @@
 # Template file for 'abiword'
 pkgname=abiword
 version=2.8.6
-revision=4
-homepage="http://www.abisource.com/"
-distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
-CPPFLAGS="-I/usr/include/boost"
+revision=5
 build_style=gnu-configure
 configure_args="--enable-shave --enable-collab-backend-telepathy
---enable-collab-backend-tcp --enable-collab-backend-service
---enable-templates --enable-clipart --enable-plugins --with-gio"
-subpackages="lib$pkgname $pkgname-devel"
-
+ --enable-collab-backend-tcp --enable-collab-backend-service
+ --enable-templates --enable-clipart --enable-plugins --with-gio
+ --disable-static"
+subpackages="lib${pkgname} ${pkgname}-devel"
 depends="hicolor-icon-theme desktop-file-utils"
-makedepends="automake flex pkg-config jpeg-devel libpng-devel>=1.5.10 fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel wv-devel boost-devel readline-devel libxslt-devel libwmf-devel"
+makedepends="automake flex pkg-config jpeg-devel libpng-devel>=1.5.10
+ fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel
+ wv-devel boost-devel readline-devel libxslt-devel libwmf-devel"
 short_desc="Free word processing program similar to Microsoft(R) Word."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
+homepage="http://www.abisource.com/"
+distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
 checksum=d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
 long_desc="
  AbiWord is a free word processing program similar to Microsoft(R) Word. It is
@@ -26,6 +27,8 @@ long_desc="
  lets you store documents online, allows easy document sharing with your
  friends, and performs format conversions on the fly."
 
+CPPFLAGS="-I/usr/include/boost"
+
 pre_configure() {
 	autoreconf -fi
 }