diff --git a/postfix-3.6.0.tar.gz b/postfix-3.6.0.tar.gz
deleted file mode 100644
index 403fba9..0000000
--- a/postfix-3.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77462894d7671d63cbe5fc2733f941088515a6d67108b9f1808b7dae37e83c2e
-size 4748506
diff --git a/postfix-3.6.0.tar.gz.asc b/postfix-3.6.0.tar.gz.asc
deleted file mode 100644
index 3340d30..0000000
--- a/postfix-3.6.0.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (FreeBSD)
-
-iFcDBQBgixN5DAtZDoDKFacRCvGZAP4h7z5Qaj9C6JpNu2NBU7nlVBfuRWWnp3Lv
-Z7oSfHfp3gD+McRFFjL7leRDWWN2W1SpeS3Fsey6tCH/resSt5U68ac=
-=AC1l
------END PGP SIGNATURE-----
diff --git a/postfix-3.6.1.tar.gz b/postfix-3.6.1.tar.gz
new file mode 100644
index 0000000..f6dc1dd
--- /dev/null
+++ b/postfix-3.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+size 4748754
diff --git a/postfix-3.6.1.tar.gz.asc b/postfix-3.6.1.tar.gz.asc
new file mode 100644
index 0000000..4daceaf
--- /dev/null
+++ b/postfix-3.6.1.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (FreeBSD)
+
+iFcDBQBgxlgfDAtZDoDKFacRCittAP9+D+UkM0n0bbBpaysrOyaZF6McXHsiumjv
+TPpIioDhigD9FOT8ITAe/onYLyxfXlu3NN/Y7zT8sGagakJzmwgJie0=
+=fZ9u
+-----END PGP SIGNATURE-----
diff --git a/postfix-bdb.changes b/postfix-bdb.changes
index 7ac7aec..126e3e3 100644
--- a/postfix-bdb.changes
+++ b/postfix-bdb.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 14 15:46:54 UTC 2021 - Michael Ströder <michael@stroeder.com>
+
+- Update to 3.6.1
+  * Bugfix (introduced: Postfix 2.11): the command "postmap
+    lmdb:/file/name" (create LMDB database from textfile) handled
+    duplicate input keys ungracefully, discarding entries stored
+    up to and including the duplicate key, and causing a double
+    free() call with lmdb versions 0.9.17 and later. Reported by
+    Adi Prasaja; double free() root cause analysis by Howard Chu.
+  * Typo (introduced: Postfix 3.4): silent_discard should be
+    silent-discard in BDAT_README.
+
 -------------------------------------------------------------------
 Wed Jun  2 00:26:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/postfix-bdb.spec b/postfix-bdb.spec
index 55682c4..fbc0fda 100644
--- a/postfix-bdb.spec
+++ b/postfix-bdb.spec
@@ -56,7 +56,7 @@
 %endif
 %bcond_without ldap
 Name:           postfix-bdb
-Version:        3.6.0
+Version: 3.6.1
 Release:        0
 Summary:        A fast, secure, and flexible mailer
 License:        IPL-1.0 OR EPL-2.0
diff --git a/postfix.changes b/postfix.changes
index 7ac7aec..126e3e3 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 14 15:46:54 UTC 2021 - Michael Ströder <michael@stroeder.com>
+
+- Update to 3.6.1
+  * Bugfix (introduced: Postfix 2.11): the command "postmap
+    lmdb:/file/name" (create LMDB database from textfile) handled
+    duplicate input keys ungracefully, discarding entries stored
+    up to and including the duplicate key, and causing a double
+    free() call with lmdb versions 0.9.17 and later. Reported by
+    Adi Prasaja; double free() root cause analysis by Howard Chu.
+  * Typo (introduced: Postfix 3.4): silent_discard should be
+    silent-discard in BDAT_README.
+
 -------------------------------------------------------------------
 Wed Jun  2 00:26:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/postfix.spec b/postfix.spec
index 1a020fd..1cef3ef 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -42,7 +42,7 @@
 %bcond_without libnsl
 %bcond_without ldap
 Name:           postfix
-Version:        3.6.0
+Version:        3.6.1
 Release:        0
 Summary:        A fast, secure, and flexible mailer
 License:        IPL-1.0 OR EPL-2.0