diff --git a/common/shlibs b/common/shlibs
index b29cf32ada3..ca8af964dee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -195,6 +195,7 @@ libss.so.2 e2fsprogs-libs-1.41.5_1_1
 libiw.so.29 wireless_tools-29_1
 libpopt.so.0 popt-1.15_1
 libtasn1.so.3 libtasn1-2.1_1
+libtasn1.so.6 libtasn1-3.2_1
 libgpg-error.so.0 libgpg-error-1.6_1
 liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.11 libgcrypt-1.4.4_1
diff --git a/srcpkgs/libtasn1/libtasn1-devel.template b/srcpkgs/libtasn1/libtasn1-devel.template
index 258c9dcbd4b..8bfc72d6825 100644
--- a/srcpkgs/libtasn1/libtasn1-devel.template
+++ b/srcpkgs/libtasn1/libtasn1-devel.template
@@ -1,16 +1,15 @@
 # Template file for 'libtasn1-devel'.
 #
 noarch=yes
-depends="glibc-devel libtasn1>=${version}"
+depends="${sourcepkg}>=${version}"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
 do_install() {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/info ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/man/man3 usr/share/man
+	vmove usr/share/info usr/share
 }
diff --git a/srcpkgs/libtasn1/libtasn1-tools.template b/srcpkgs/libtasn1/libtasn1-tools.template
index 5da5e0d9885..8b76552f7d6 100644
--- a/srcpkgs/libtasn1/libtasn1-tools.template
+++ b/srcpkgs/libtasn1/libtasn1-tools.template
@@ -5,10 +5,7 @@ long_desc="${long_desc}
 
  This package contains some ASN.1 tools that come with libtasn1."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1 ${DESTDIR}/usr/share/man
+do_install() {
+	vmove usr/bin usr
+	vmove usr/share usr
 }
diff --git a/srcpkgs/libtasn1/template b/srcpkgs/libtasn1/template
index 31c3a54e2ff..5a279fa1026 100644
--- a/srcpkgs/libtasn1/template
+++ b/srcpkgs/libtasn1/template
@@ -1,8 +1,8 @@
 # Template build file for 'libtasn1'.
 pkgname=libtasn1
-version=2.14
+version=3.2
 revision=1
-subpackages="$pkgname-devel $pkgname-tools"
+subpackages="${pkgname}-devel ${pkgname}-tools"
 build_style=gnu-configure
 configure_args="--disable-static"
 short_desc="ASN.1 structure parser library"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libtasn1/"
 license="GPL-3, LGPL-2.1"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=bc2936cd20267859278145e563427c274d27aaae30ecdf50a04cdd4ec0153d54
+checksum=672ee08108a0f98b006377ab9e5e926ed6d7e4811f18538f838c457e7db36f3f
 long_desc="
  libtasn1 library was developed for ASN1 (Abstract Syntax Notation One)
  structures management.