diff --git a/package/Config.in b/package/Config.in
index ff2dce51d3..0a50369ed1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -118,6 +118,7 @@ source "package/readline/Config.in"  # libreadline
 source "package/cyrus-sasl/Config.in"  # libsasl2
 source "package/speex/Config.in" # libspeex
 source "package/sqlite/Config.in" # libsqlite
+source "package/libtasn1/Config.in"
 source "package/libusb/Config.in"
 source "package/uclibc++/Config.in"
 source "package/zlib/Config.in"
diff --git a/package/Makefile b/package/Makefile
index b9338b4f53..4551b0d2e5 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -51,6 +51,7 @@ package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
 package-$(BR2_PACKAGE_LIBPCAP) += libpcap
 package-$(BR2_PACKAGE_LIBPNG) += libpng
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
+package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
 package-$(BR2_PACKAGE_LIBTOOL) += libtool
 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
diff --git a/package/libtasn1/Config.in b/package/libtasn1/Config.in
new file mode 100644
index 0000000000..b47b934db8
--- /dev/null
+++ b/package/libtasn1/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBTASN1
+	tristate "libtasn1 - an ASN.1 and DER structures manipulation library"
+#	default m if CONFIG_DEVEL
+	default n
+	help
+	 This is a library for Abstract Syntax Notation One (ASN.1) and 
+	 Distinguish Encoding Rules (DER) manipulation.
+	 
+	 ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
+	 
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
new file mode 100644
index 0000000000..1919d1253a
--- /dev/null
+++ b/package/libtasn1/Makefile
@@ -0,0 +1,105 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libtasn1
+PKG_VERSION:=0.2.13
+PKG_RELEASE:=0
+PKG_MD5SUM:=d124b11908cfb88883fe71472c25d53a
+
+PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
+	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \
+	http://www.mirrors.wiretapped.net/security/network-security/gnutls/libtasn1/ \
+	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/libtasn1/ \
+	http://josefsson.org/gnutls/releases/libtasn1/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+BR2_PACKAGE_LIBTASN1=m
+
+$(eval $(call PKG_template,LIBTASN1,libtasn1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		touch configure.ac ; \
+		touch acinclude.m4 ; \
+		touch aclocal.m4 ; \
+		touch Makefile.in ; \
+		touch config.h.in ; \
+		touch configure ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--datadir=/usr/share \
+		--includedir=/usr/include \
+		--infodir=/usr/share/info \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
+		--enable-shared \
+		--enable-static \
+		--disable-rpath \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
+
+$(IPKG_LIBTASN1): $(STAGING_DIR)/usr/lib/libtasn1.so
+	install -m0755 -d $(IDIR_LIBTASN1)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBTASN1)
+	$(IPKG_BUILD) $(IDIR_LIBTASN1) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libtasn1.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/
+	mkdir -p $(STAGING_DIR)/usr/include
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/share/aclocal
+	cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libtasn1.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/libtasn1-config \
+		$(STAGING_DIR)/usr/include/libtasn1.h \
+		$(STAGING_DIR)/usr/lib/libtasn1.{a,so*} \
+		$(STAGING_DIR)/usr/share/aclocal/libtasn1.m4 \
+
+compile: install-dev
+
+clean: uninstall-dev
+
+mostlyclean:
+	make -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
diff --git a/package/libtasn1/ipkg/libtasn1.control b/package/libtasn1/ipkg/libtasn1.control
new file mode 100644
index 0000000000..05d6e8eb91
--- /dev/null
+++ b/package/libtasn1/ipkg/libtasn1.control
@@ -0,0 +1,8 @@
+Package: libtasn1
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: OpenWrt Developers Team <bugs@openwrt.org>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/libtasn1s/
+Description: an ASN.1 and DER structures manipulation library
diff --git a/package/libtasn1/patches/500-cross-compile.patch b/package/libtasn1/patches/500-cross-compile.patch
new file mode 100644
index 0000000000..dadbf2b845
--- /dev/null
+++ b/package/libtasn1/patches/500-cross-compile.patch
@@ -0,0 +1,28 @@
+diff -ruN libtasn1-0.2.13-orig/configure libtasn1-0.2.13-1/configure
+--- libtasn1-0.2.13-orig/configure	2004-12-15 19:40:02.000000000 +0100
++++ libtasn1-0.2.13-1/configure	2005-03-15 22:35:56.000000000 +0100
+@@ -22448,8 +22448,8 @@
+ 
+ 
+ 
+-LIBTASN1_LIBS="-L${libdir} -ltasn1 $LIBS"
+-LIBTASN1_CFLAGS="-I${includedir}"
++LIBTASN1_LIBS="-ltasn1 $LIBS"
++LIBTASN1_CFLAGS=""
+ 
+ 
+ 
+diff -ruN libtasn1-0.2.13-orig/configure.in libtasn1-0.2.13-1/configure.in
+--- libtasn1-0.2.13-orig/configure.in	2004-12-15 19:39:01.000000000 +0100
++++ libtasn1-0.2.13-1/configure.in	2005-03-15 22:35:46.000000000 +0100
+@@ -85,8 +85,8 @@
+ ])
+ AM_PROG_LIBTOOL
+ 
+-LIBTASN1_LIBS="-L${libdir} -ltasn1 $LIBS"
+-LIBTASN1_CFLAGS="-I${includedir}"
++LIBTASN1_LIBS="-ltasn1 $LIBS"
++LIBTASN1_CFLAGS=""
+ 
+ AC_SUBST(LIBTASN1_LIBS)
+ AC_SUBST(LIBTASN1_CFLAGS)