diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 5edb479d9f..2e3712554e 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -27,6 +27,12 @@ config BR2_PACKAGE_OPENVPN_SMALL
 	  You loose eurephia, debugging info, help messages and more.
 	  It saves around 100 KiB in binary file size.
 
+config BR2_PACKAGE_OPENVPN_PWSAVE
+	bool "Allow passwords in files"
+	help
+	  Allow --askpass and --auth-user-pass passwords to be read
+	  from a file.
+
 choice
 	prompt "Crypto backend"
 	default BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 1caa9a0336..2973928a73 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -41,6 +41,12 @@ else
 OPENVPN_CONF_OPTS += --disable-lzo
 endif
 
+ifeq ($(BR2_PACKAGE_OPENVPN_PWSAVE),y)
+OPENVPN_CONF_OPTS += --enable-password-save
+else
+OPENVPN_CONF_OPTS += --disable-password-save
+endif
+
 ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL),y)
 OPENVPN_CONF_OPTS += --with-crypto-library=openssl
 OPENVPN_DEPENDENCIES += openssl