diff --git a/package/Config.in b/package/Config.in
index 3f3b8d213..0e454dc29 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1133,6 +1133,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/procps-ng/Config.in"
 	source "package/psmisc/Config.in"
 endif
+	source "package/pwgen/Config.in"
 	source "package/quota/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/rsyslog/Config.in"
diff --git a/package/pwgen/Config.in b/package/pwgen/Config.in
new file mode 100644
index 000000000..7bbc1d6d5
--- /dev/null
+++ b/package/pwgen/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PWGEN
+	bool "pwgen"
+	help
+	  Pwgen is a small, GPL'ed password generator which creates passwords
+	  which can be easily memorized by a human.
+
+	  http://sourceforge.net/projects/pwgen/
diff --git a/package/pwgen/pwgen.mk b/package/pwgen/pwgen.mk
new file mode 100644
index 000000000..cdc2fd351
--- /dev/null
+++ b/package/pwgen/pwgen.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# pwgen
+#
+################################################################################
+
+PWGEN_VERSION = 2.06
+PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION)
+PWGEN_LICENSE = GPLv2
+PWGEN_LICENSE_FILES = debian/copyright
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))