diff --git a/dovecot-2.3-pigeonhole-0.5.1.tar.gz.sig b/dovecot-2.3-pigeonhole-0.5.1.tar.gz.sig
new file mode 100644
index 0000000..fc2218a
--- /dev/null
+++ b/dovecot-2.3-pigeonhole-0.5.1.tar.gz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJausY5AAoJEATWKx49+7T0VvQIAKzBCxGmq0MDrvYg3nFREQOs
+qQ+MJARnyPXxxu2lKdCdUUzT8Yg3zlKlLwjHRASq34yztTUOhbp0JdctIFU5ykbM
+MZ/GsPvUBKpA0y1UoRDKibE1giM818S7q3RWi7KMVCOXvAJtSlemHZRlVEAdtwnC
+OMteFYVo+zARPAgk7YKlghbKID16JErmjFQzr4QZE8+p1dI22G5OKHP9G5cC7VSN
+HYntFc5LhBMhzIv19hZWghWNJdmOxCqpI5999sx+moQNfe3uN1esKcEB1AHFzrvl
+Uf67NE8jK1wLVeE+d8syB7omC4uL/Y/shcgpjCQ7SUDrDENyfBMoC5Pc/Hlb0iY=
+=+XOK
+-----END PGP SIGNATURE-----
diff --git a/dovecot-2.3.1.tar.gz.sig b/dovecot-2.3.1.tar.gz.sig
new file mode 100644
index 0000000..5ee7451
--- /dev/null
+++ b/dovecot-2.3.1.tar.gz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJLBAABCAA1FiEEK+dKqz7nVN+5yA0zGKNIru1AnaEFAlq6eFAXHGRvdmVjb3Qt
+Y2VAZG92ZWNvdC5vcmcACgkQGKNIru1AnaFrRQ//fN5gD247sLNRVDDdkG9JpoOT
+nVLV1m9DX5jxPcWxir3vovP8WnVO6qrBYk/d+uJvtgBT6e09yW6wF1PozD1HrBXA
+6JqTE/DmBXSvuX4Zf7ENq90Th/jYOdZ/jWrb3nGeDq9uCqW3KjGI6Yry3zumu+XH
+G4RaV6tfenOBuhUM8V5yo8+JqfUXZgdYtF9Wx+x8JkWjChdPE1kJX2lt8RTrqw9K
+l51m5KqiQavbw7EppLwYa58n6+UDaufsgN8w5OWhuPsPaWHd3KZhd+POTL8ClORQ
+DOIyzmBj0JS+97gv0kktMxSq1sqEBnRtwbIJ37YGqYZsJencGJZYX8ZARPx3XXbh
+e0iugv5rB+g8U6521KNx3c/0vzGswe5YqcVuDJPRusEvTpiHeYGpA87kCnCmpQ+M
+77+lS/NNvS3BsBUU4dWVLZKBx6XZ/fvVcVJyHF2+l+UrDf8uK9lnr+B1oQgmXyR5
+tZ0LwqKq6uAp0+E7kK0Uscm3d1skguOz1QMAELQ3v0G8M04it2Ijzu+/0qWFIM46
+UuqITWhpxX6jZQLNRY+AtJTxCFxZzomPGCBSdc86nYV9803zE+ReWZooVNnZprOT
+IYlt//fXIA4acvCGU4yU2pE7RaZaULbG/nLpWZo8AylqIjxjhpv6BvgMFf1U8RAi
+PbLbr+SGtMuB1fQ0HTw=
+=eRuT
+-----END PGP SIGNATURE-----
diff --git a/dovecot23.changes b/dovecot23.changes
index 0176155..1acb2f1 100644
--- a/dovecot23.changes
+++ b/dovecot23.changes
@@ -4,6 +4,12 @@ Sun May 27 09:31:02 UTC 2018 - mrueckert@suse.de
 - added 847790d5aab84df38256a6f9b4849af0eb408419.patch:
   Fix crash for over quota users
 
+-------------------------------------------------------------------
+Thu May 24 09:42:48 UTC 2018 - kbabioch@suse.com
+
+- Use OpenPGP signatures provided upstream
+- Added dovecot23.keyring, which contains the keys from the upstream projects
+
 -------------------------------------------------------------------
 Tue Apr 10 15:46:04 UTC 2018 - varkoly@suse.com
 
diff --git a/dovecot23.keyring b/dovecot23.keyring
new file mode 100644
index 0000000..369f852
--- /dev/null
+++ b/dovecot23.keyring
@@ -0,0 +1,68 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+BWoyZxpdESCzsL3JU8wy7TQ=
+=Z5jJ
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBEe3MzIBCADcP+MLyAG1kuy809S9esj7HiWFIzs7qkGm1dXnCIsrVMZWfzmY
+RSSeAuDIooFXrEf4N1EJgj0m/MX5T9ok39olvwOYwN4F845hUY/cybHTha2PpcIR
+VaYsfiyc54OSq25FIITxNghz5pMKHnnIX8++fnHQfQbhBG6dkfsG0aHoTlbv6/iY
+QmcxzGjkWJ6o2lIjcGze8Jq9xLvPjmxPFUXBYE81IXtsCN37f3FCyIgQd7GxuChl
+f0KX9eln+T6dqiuyPKdSpougKvPZWNVssfPhGnC+uoQ4IeKp02hIDQtDFo2sK0Mc
+/La+GZWWoHad0fTP40yOE9XhispfX6nStQpxABEBAAG0JFN0ZXBoYW4gQm9zY2gg
+PHN0ZXBoYW5AcmVuYW1lLWl0Lm5sPokBNgQTAQIAIAUCR7czMgIbAwYLCQgHAwIE
+FQIIAwQWAgMBAh4BAheAAAoJEATWKx49+7T0xwMH/3T2AuierwGBd75UERws2x8d
+r4nvQcop229Mz4etOZZu4LFaTMVhLHY4ZVxddJWp87YVV553B3p/vVrY1Q0mku1P
+M4Im8HTla/saJlBJjgjq4BKoKRKnJDhS9tSs12UxIu2qYZlR3x78rl6IC94h+OxE
+ZrgK6EkY8LtuRHtEgAoDXt07zbOypGyZnh5DJYMr3cXmIi1FjAMT1kJiDlhbgP4F
+DUKmnaXEq9KE5dQhkXSBWBsgQg12DChabZ69jrAX2nrtvb3r9O/Hth7XnPq7F2zG
+FfbfgRH9lMCixlh40NfsWyseAKTNRDZFm1U8POn1+R5mU6enyACrkZAYDBaExR8=
+=pFc1
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/dovecot23.spec b/dovecot23.spec
index 13883aa..4435c9e 100644
--- a/dovecot23.spec
+++ b/dovecot23.spec
@@ -131,6 +131,9 @@ Source6:        dovecot-2.3.configfiles
 Source7:        dovecot-2.1-pigeonhole.configfiles
 Source8:        dovecot-2.2-pigeonhole.configfiles
 Source9:        dovecot-2.3-pigeonhole.configfiles
+Source10:       http://www.dovecot.org/releases/%{dovecot_branch}/%{pkg_name}-%{dovecot_version}.tar.gz.sig
+Source11:       http://pigeonhole.dovecot.org/releases/%{dovecot_branch}/%{dovecot_pigeonhole_source_dir}.tar.gz.sig
+Source12:       dovecot23.keyring
 Patch:          dovecot-2.3.0-dont_use_etc_ssl_certs.patch
 Patch1:         dovecot-2.3.0-better_ssl_defaults.patch
 Patch2:         35497604d80090a02619024aeec069b32568e4b4.diff