diff --git a/srcpkgs/libexif/libexif-devel.template b/srcpkgs/libexif/libexif-devel.template
index 20e6714b96..5bb9c3f7a1 100644
--- a/srcpkgs/libexif/libexif-devel.template
+++ b/srcpkgs/libexif/libexif-devel.template
@@ -1,16 +1,13 @@
 # Template file for 'libexif-devel'.
 #
-depends="glibc-devel libexif"
-short_desc="${sourcepkg} development files"
+depends="glibc-devel libexif>=$version"
+short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/libexif/template b/srcpkgs/libexif/template
index 74813548dc..27356455a7 100644
--- a/srcpkgs/libexif/template
+++ b/srcpkgs/libexif/template
@@ -1,17 +1,17 @@
 # Template build file for 'libexif'.
 pkgname=libexif
-version=0.6.20
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+version=0.6.21
+revision=1
 build_style=gnu-configure
+subpackages="$pkgname-devel"
 configure_args="ac_cv_path_DOXYGEN=false"
-revision=2
 short_desc="EXIF file library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a772d20bd8fb9802d7f0d70fde6ac8872f87d0c66c52b0d14026dafcaa83d715
+homepage="http://sourceforge.net/projects/libexif"
+license="LGPL-2.1"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+checksum=16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a
 long_desc="
  Most digital cameras produce EXIF files, which are JPEG files with
- extra tags that contain information about the image. The EXIF
- library allows you to parse an EXIF file and read the data from
- those tags."
-
-subpackages="$pkgname-devel"
+ extra tags that contain information about the image. The EXIF library
+ allows you to parse an EXIF file and read the data from those tags."