diff --git a/alpine-pinepw.patch b/alpine-pinepw.patch
new file mode 100644
index 0000000..2c15d01
--- /dev/null
+++ b/alpine-pinepw.patch
@@ -0,0 +1,20 @@
+diff -rc alpine-2.21/alpine/imap.c alpine-2.21.pwdfilebug/alpine/imap.c
+*** alpine-2.21/alpine/imap.c	2017-02-05 17:06:22.523218671 -0700
+--- alpine-2.21.pwdfilebug/alpine/imap.c	2019-04-27 16:48:22.433116057 -0600
+***************
+*** 2636,2642 ****
+         if(ps_global->pwdcert == NULL){
+  	  q_status_message(SM_ORDER, 3, 3, "Attempting to encrypt password file");
+  	  i = setup_pwdcert(&ps_global->pwdcert);
+! 	  if(i == 0 && ps_global->pwdcert == NULL)
+  	    ps_global->pwdcert = (void *) ALPINE_self_signed_certificate(NULL, 0, ps_global->pwdcertdir, MASTERNAME);
+         }
+         if(ps_global->pwdcert == NULL){	/* we tried but failed	*/
+--- 2636,2642 ----
+         if(ps_global->pwdcert == NULL){
+  	  q_status_message(SM_ORDER, 3, 3, "Attempting to encrypt password file");
+  	  i = setup_pwdcert(&ps_global->pwdcert);
+! 	  if((i == 0 || i == -5) && ps_global->pwdcert == NULL)
+  	    ps_global->pwdcert = (void *) ALPINE_self_signed_certificate(NULL, 0, ps_global->pwdcertdir, MASTERNAME);
+         }
+         if(ps_global->pwdcert == NULL){	/* we tried but failed	*/
diff --git a/alpine.changes b/alpine.changes
index 02d4b4f..126ce63 100644
--- a/alpine.changes
+++ b/alpine.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  2 14:22:58 UTC 2019 - Reinhard Max <max@suse.com>
+
+- Fix initialisation of encrypted password store (bsc#1133597,
+  alpine-pinepw.patch).
+
 -------------------------------------------------------------------
 Thu Nov  8 08:46:18 UTC 2018 - Michal Svec <msvec@suse.com>
 
diff --git a/alpine.spec b/alpine.spec
index 63cee52..aa054b3 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package alpine
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -36,6 +36,7 @@ Patch3:         operation-may-be-undefined-warning.diff
 Patch4:         fix-implicit.patch
 Patch5:         alpine-gcc44.diff
 Patch6:         alpine-timestamp.patch
+Patch7:         alpine-pinepw.patch
 Patch10:        pico-fix-spurious-undef-warnings.diff
 Patch20:        pine-expression-warnings.diff
 Patch60:        signal-and-panic-improvements.diff
@@ -131,6 +132,7 @@ fi
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch10 -p1
 %patch20 -p1
 %patch60 -p1