diff --git a/package/Config.in b/package/Config.in
index 3dcb94946d..9f45f7359f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -74,6 +74,7 @@ source "package/kexec/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/less/Config.in"
 endif
+source "package/libbeecrypt/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
diff --git a/package/libbeecrypt/Config.in b/package/libbeecrypt/Config.in
new file mode 100644
index 0000000000..e0e40486dd
--- /dev/null
+++ b/package/libbeecrypt/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBBEECRYPT
+	bool "libbeecrypt"
+	default n
+	help
+	  Beecrypt is a general-purpose cryptography library.
+
+	  http://rpm5.org
diff --git a/package/libbeecrypt/beecrypt-4.1.2_disable-cxxglue.patch b/package/libbeecrypt/beecrypt-4.1.2_disable-cxxglue.patch
new file mode 100644
index 0000000000..6c4093677c
--- /dev/null
+++ b/package/libbeecrypt/beecrypt-4.1.2_disable-cxxglue.patch
@@ -0,0 +1,12 @@
+diff -ru beecrypt-4.1.2_vanilla/Makefile.am beecrypt-4.1.2_disable-cxxglue/Makefile.am
+--- beecrypt-4.1.2_vanilla/Makefile.am	2004-12-22 07:06:31.000000000 +0000
++++ beecrypt-4.1.2_disable-cxxglue/Makefile.am	2008-03-21 23:24:51.000000000 +0000
+@@ -49,7 +49,7 @@
+ 
+ libalt_LTLIBRARIES = libbeecrypt.la
+ 
+-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c cppglue.cxx
++libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c
+ libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
+ libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo
+ libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
diff --git a/package/libbeecrypt/libbeecrypt.mk b/package/libbeecrypt/libbeecrypt.mk
new file mode 100644
index 0000000000..49f2d34b4f
--- /dev/null
+++ b/package/libbeecrypt/libbeecrypt.mk
@@ -0,0 +1,75 @@
+#############################################################
+#
+# libbeecrypt
+#
+#############################################################
+LIBBEECRYPT_VERSION:=4.1.2
+LIBBEECRYPT_SOURCE:=beecrypt-$(LIBBEECRYPT_VERSION).tar.gz
+LIBBEECRYPT_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/beecrypt
+LIBBEECRYPT_DIR:=$(BUILD_DIR)/beecrypt-$(LIBBEECRYPT_VERSION)
+LIBBEECRYPT_CAT:=$(ZCAT)
+
+$(DL_DIR)/$(LIBBEECRYPT_SOURCE):
+	$(WGET) -P $(DL_DIR) $(LIBBEECRYPT_SITE)/$(LIBBEECRYPT_SOURCE)
+
+libbeecrypt-source: $(DL_DIR)/$(LIBBEECRYPT_SOURCE)
+
+$(LIBBEECRYPT_DIR)/.unpacked: $(DL_DIR)/$(LIBBEECRYPT_SOURCE)
+	$(LIBBEECRYPT_CAT) $(DL_DIR)/$(LIBBEECRYPT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(LIBBEECRYPT_DIR) package/libbeecrypt/ beecrypt\*.patch
+	touch $@
+
+$(LIBBEECRYPT_DIR)/.configured: $(LIBBEECRYPT_DIR)/.unpacked
+	(cd $(LIBBEECRYPT_DIR); rm -rf config.cache; \
+		autoreconf; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=$(STAGING_DIR)/usr \
+		--exec_prefix=$(STAGING_DIR) \
+		--libdir=$(STAGING_DIR)/usr/lib \
+		--includedir=$(STAGING_DIR)/usr/include \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--without-cplusplus \
+		--without-java \
+		--without-python \
+		$(DISABLE_NLS) \
+	)
+	touch $@
+
+$(LIBBEECRYPT_DIR)/.libs/libbeecrypt.so: $(LIBBEECRYPT_DIR)/.configured
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(LIBBEECRYPT_DIR)
+
+$(STAGING_DIR)/usr/lib/libbeecrypt.so: $(LIBBEECRYPT_DIR)/.libs/libbeecrypt.so
+	$(MAKE) -C $(LIBBEECRYPT_DIR) install
+
+$(TARGET_DIR)/usr/lib/libbeecrypt.so: $(STAGING_DIR)/usr/lib/libbeecrypt.so
+	cp -dpf $(STAGING_DIR)/usr/lib/libbeecrypt.so* $(TARGET_DIR)/usr/lib/
+
+libbeecrypt: uclibc $(TARGET_DIR)/usr/lib/libbeecrypt.so
+
+libbeecrypt-clean:
+	rm -f $(TARGET_DIR)/usr/lib/libbeecrypt.so*
+	-$(MAKE) -C $(LIBBEECRYPT_DIR) clean
+
+libbeecrypt-dirclean:
+	rm -rf $(LIBBEECRYPT_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_LIBBEECRYPT)),y)
+TARGETS+=libbeecrypt
+endif