diff --git a/srcpkgs/abiword/abiword-devel.template b/srcpkgs/abiword/abiword-devel.template
index c1401a1002f..d4abdf9ef53 100644
--- a/srcpkgs/abiword/abiword-devel.template
+++ b/srcpkgs/abiword/abiword-devel.template
@@ -1,20 +1,14 @@
 # Template file for 'abiword-devel'.
 #
-depends="glibc-devel libabiword"
+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}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
-        vmove usr/include usr
-        vmove "usr/lib/*.a" usr/lib
-	vmkdir usr/lib/abiword-2.8/plugins
-	vmove "usr/lib/abiword-2.8/plugins/*.a" \
-		usr/lib/abiword-2.8/plugins
-        vmove usr/lib/pkgconfig usr/lib
+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/abiword.rshlibs b/srcpkgs/abiword/abiword.rshlibs
index 14045226d31..9372670fe6a 100644
--- a/srcpkgs/abiword/abiword.rshlibs
+++ b/srcpkgs/abiword/abiword.rshlibs
@@ -1,2 +1,24 @@
 libabiword-2.8.so
 libc.so.6
+libgsf-1.so.114
+libxml2.so.2
+libgthread-2.0.so.0
+librt.so.1
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpng14.so.14
+libjpeg.so.8
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libreadline.so.6
+libhistory.so.6
+libpthread.so.0
+libxslt.so.1
+libz.so.1
+libwmf-0.2.so.7
+libwmflite-0.2.so.7
+libfreetype.so.6
+libbz2.so.1
+libX11.so.6
+libexpat.so.1
diff --git a/srcpkgs/abiword/libabiword.rshlibs b/srcpkgs/abiword/libabiword.rshlibs
index 16748dae06c..55f6c59f68b 100644
--- a/srcpkgs/abiword/libabiword.rshlibs
+++ b/srcpkgs/abiword/libabiword.rshlibs
@@ -27,12 +27,3 @@ libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
-libreadline.so.6
-libhistory.so.6
-libpthread.so.0
-libxslt.so.1
-libwmf-0.2.so.7
-libwmflite-0.2.so.7
-libbz2.so.1
-libX11.so.6
-libexpat.so.1
diff --git a/srcpkgs/abiword/libabiword.template b/srcpkgs/abiword/libabiword.template
index 2f636510dfc..f2ea2ffcb4d 100644
--- a/srcpkgs/abiword/libabiword.template
+++ b/srcpkgs/abiword/libabiword.template
@@ -3,13 +3,8 @@
 short_desc="${short_desc} - Runtime library"
 long_desc="${long_desc}
 
- This package contains the runtime."
+ This package contains the runtime libraries."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
-	vmkdir usr/lib/abiword-2.8
-	vmove "usr/lib/abiword-2.8/plugins/*.so*" \
-		usr/lib/abiword-2.8/plugins
 }
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index 00a3e548fcc..fb80ecc0a66 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -4,13 +4,15 @@ version=2.8.6
 revision=3
 homepage="http://www.abisource.com/"
 distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
+CPPFLAGS="-I/usr/include/boost"
 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"
-makedepends="automake pkg-config fribidi-devel libgsf-devel libxml2-devel libpng-devel enchant-devel zlib-devel gtk+-devel atk-devel pango-devel freetype-devel fontconfig-devel librsvg-devel glib-devel gdk-pixbuf-devel cairo-devel libstdc++-devel wv-devel boost-devel readline-devel libxslt-devel libwmf-devel libX11-devel expat-devel"
-fulldepends="hicolor-icon-theme desktop-file-utils"
+--enable-templates --enable-clipart --enable-plugins --with-gio"
+subpackages="lib$pkgname $pkgname-devel"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="automake flex pkg-config 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"
@@ -24,15 +26,6 @@ long_desc="
  lets you store documents online, allows easy document sharing with your
  friends, and performs format conversions on the fly."
 
-subpackages="lib$pkgname $pkgname-devel"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-
-
-
-CPPFLAGS="-I/usr/include/boost"
-
 pre_configure() {
-#	libtoolize -f
 	autoreconf -fi
 }