diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 860a39f03..3feffa301 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -38,4 +38,16 @@ config BR2_COMPILE_OPENVPN_WITH_LZO
 	depends BR2_PACKAGE_OPENVPN
 	select BR2_PACKAGE_LIBLZO
 
+config BR2_COMPILE_OPENVPN_WITH_PASSWORD_SAVE
+	prompt "Enable password saving"
+	bool
+	default y
+	depends BR2_PACKAGE_OPENVPN
+
+config BR2_COMPILE_OPENVPN_WITH_SMALL
+	prompt "Enable smaller executable size (disable OCC, usage message, and verb 4 parm list)"
+	bool
+	default n
+	depends BR2_PACKAGE_OPENVPN
+
 endmenu
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index e5e127584..5ae1a3120 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -38,6 +38,12 @@ endif
 ifneq ($(BR2_COMPILE_OPENVPN_WITH_HTTP),y)
 DISABLE_HTTP:=--disable-http
 endif
+ifeq ($(BR2_COMPILE_OPENVPN_WITH_PASSWORD_SAVE),y)
+ENABLE_PASSWORD_SAVE:=--enable-password-save
+endif
+ifeq ($(BR2_COMPILE_OPENVPN_WITH_SMALL),y)
+ENABLE_SMALL:=--enable-small
+endif
 
 $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -76,6 +82,8 @@ $(PKG_BUILD_DIR)/.configured:
 		  $(DISABLE_OPENSSL) \
 		  $(DISABLE_SERVER) \
 		  $(DISABLE_HTTP) \
+		  $(ENABLE_PASSWORD_SAVE) \
+		  $(ENABLE_SMALL) \
 	);
 	touch $(PKG_BUILD_DIR)/.configured