diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index aeb31535c6..5df22be9cd 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -1,14 +1,14 @@
 # Template file for 'abiword'
 pkgname=abiword
 version=2.8.6
-revision=7
+revision=8
 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
  --disable-static"
 hostmakedepends="automake libtool flex pkg-config"
-makedepends="libjpeg-turbo-devel libpng-devel>=1.5.10
+makedepends="libjpeg-turbo-devel libpng-devel>=1.6
  fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel
  wv-devel boost-devel libxslt-devel libwmf-devel"
 short_desc="Free word processing program similar to Microsoft(R) Word"
@@ -25,7 +25,7 @@ pre_configure() {
 }
 
 libabiword_package() {
-	short_desc="${short_desc} - Runtime library"
+	short_desc+=" - Runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so*" usr/lib
 	}
@@ -34,7 +34,7 @@ libabiword_package() {
 abiword-devel_package() {
 	depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel
 		librsvg-devel libabiword>=${version}"
-	short_desc="${short_desc} - Development files"
+	short_desc+=" - Development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -44,6 +44,6 @@ abiword-devel_package() {
 abiword_package() {
 	depends="hicolor-icon-theme desktop-file-utils"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }