diff --git a/DEVELOPERS b/DEVELOPERS
index afd8f383a2..70a5428b8c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1440,6 +1440,9 @@ F:	package/libtasn1/
 F:	package/proxychains-ng/
 F:	package/yasm/
 
+N:	Stefan Sørensen <stefan.sorensen@spectralink.com>
+F:	package/libscrypt/
+
 N:	Stephan Hoffmann <sho@relinux.de>
 F:	package/cache-calibrator/
 F:	package/gtest/
diff --git a/package/Config.in b/package/Config.in
index 7721727bbc..85e4dee843 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -937,6 +937,7 @@ menu "Crypto"
 	source "package/libmcrypt/Config.in"
 	source "package/libmhash/Config.in"
 	source "package/libnss/Config.in"
+	source "package/libscrypt/Config.in"
 	source "package/libsecret/Config.in"
 	source "package/libsha1/Config.in"
 	source "package/libsodium/Config.in"
diff --git a/package/libscrypt/Config.in b/package/libscrypt/Config.in
new file mode 100644
index 0000000000..b467fd6e3d
--- /dev/null
+++ b/package/libscrypt/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBSCRYPT
+	bool "libscrypt"
+	# Unconditionally builds a shared library
+	depends on !BR2_STATIC_LIBS
+	help
+	  This is a library that implements the secure password
+	  hashing function "scrypt".
+
+	  http://www.lolware.net/libscrypt.html
+
+comment "libscrypt needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash
new file mode 100644
index 0000000000..bf3f441192
--- /dev/null
+++ b/package/libscrypt/libscrypt.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3	libscrypt-v1.21.tar.gz
diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk
new file mode 100644
index 0000000000..8f72d67f94
--- /dev/null
+++ b/package/libscrypt/libscrypt.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# libscrypt
+#
+################################################################################
+
+LIBSCRYPT_VERSION = v1.21
+LIBSCRYPT_SITE = $(call github,technion,libscrypt,$(LIBSCRYPT_VERSION))
+LIBSCRYPT_LICENSE = BSD-2c
+LIBSCRYPT_LICENSE_FILES = LICENSE
+LIBSCRYPT_INSTALL_STAGING = YES
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+define LIBSCRYPT_DISABLE_STACK_PROTECTOR
+	$(SED) 's/-fstack-protector//g' $(@D)/Makefile
+endef
+LIBSCRYPT_POST_PATCH_HOOKS += LIBSCRYPT_DISABLE_STACK_PROTECTOR
+endif
+
+define LIBSCRYPT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define LIBSCRYPT_INSTALL_STAGING_CMDS
+        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \
+		DESTDIR=$(STAGING_DIR) install
+endef
+
+define LIBSCRYPT_INSTALL_TARGET_CMDS
+        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \
+		DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))