diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
index 0f8d55ce1f..26e1df75ef 100644
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
+++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template
@@ -1,14 +1,10 @@
 # Template file for 'libjpeg-turbo-devel'.
 #
-depends="glibc-devel libjpeg-turbo>=$version"
+depends="glibc-devel libjpeg-turbo>=${version}"
 provides="jpeg-devel-8"
 replaces="jpeg-devel>=0"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+short_desc="${short_desc} -- development files"
 
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
index 6adcfe6a5d..0d789cc6d1 100644
--- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
+++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template
@@ -1,12 +1,8 @@
 # Template file for 'libjpeg-turbo-tools'.
 #
-depends="libjpeg-turbo>=$version"
 provides="jpeg-tools-8"
 replaces="jpeg-tools>=0"
-short_desc="${sourcepkg} - bundled tools"
-long_desc="${long_desc}
-
- This package contains tools to manipulate JPG files."
+short_desc="${short_desc} - bundled tools"
 
 do_install() {
 	vmove usr/bin usr
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index ae24b69ef0..91163ee163 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,12 +1,12 @@
 # Template build file for 'libjpeg-turbo'.
 pkgname=libjpeg-turbo
 version=1.2.1
-revision=1
+revision=2
 provides="jpeg-8"
 replaces="jpeg>=0"
 subpackages="${pkgname}-devel ${pkgname}-tools"
 build_style=gnu-configure
-configure_args="--with-jpeg8"
+configure_args="--disable-static --with-jpeg8"
 makedepends="nasm"
 short_desc="Derivative of libjpeg which uses SIMD instructions"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,12 +14,6 @@ license="BSD"
 homepage="http://libjpeg-turbo.virtualgl.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=cb3323f054a02cedad193bd0ca418d46934447f995d19e678ea64f78e4903770
-long_desc="
- $pkgname is a derivative of libjpeg which uses SIMD instructions
- MMX, SSE2, etc. to accelerate baseline JPEG compression and decompression
- on x86, x86-64, and other supported systems. On such systems, $pkgname is
- generally 2-4x as fast as the unmodified version of libjpeg, all else being
- equal."
 
 post_install() {
 	vinstall jpegint.h 644 usr/include