diff --git a/Makefile b/Makefile
index 0885d4f23..99816f4cb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=5.0
 
 PACKAGE=ceph
 VER=12.1.0
-DEBREL=pve1
+DEBREL=pve2
 
 SRCDIR=ceph
 BUILDSRC=${SRCDIR}-${VER}
diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 3c0e739af..1a36f1a39 100644
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -11,11 +11,19 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  debian/changelog | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 70 insertions(+)
 
-diff --git a/debian/changelog b/debian/changelog
-index 9a6469c30c..d2c5a9b509 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,27 +1,97 @@
+Index: ceph-12.1.0/debian/changelog
+===================================================================
+--- ceph-12.1.0.orig/debian/changelog
++++ ceph-12.1.0/debian/changelog
+@@ -1,27 +1,105 @@
++ceph (12.1.0-pve2) unstable; urgency=medium
++
++  * fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819
++
++  * add 0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch
++
++ -- Proxmox Support Team <support@proxmox.com>  Mon, 03 Jul 2017 14:03:31 +0200
++
 +ceph (12.1.0-pve1) stable; urgency=medium
 +
 +  * rebase on latest upstream Release Candidate
@@ -113,6 +121,3 @@ index 9a6469c30c..d2c5a9b509 100644
  ceph (12.0.0-1) stable; urgency=medium
  
    * New upstream release
--- 
-2.11.0
-
diff --git a/patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch b/patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch
new file mode 100644
index 000000000..c064ef2d5
--- /dev/null
+++ b/patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch
@@ -0,0 +1,23 @@
+From c90f0605b6b94579ef0273e63934d4691eb69f00 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@redhat.com>
+Date: Mon, 3 Jul 2017 16:51:21 +0800
+Subject: [PATCH] debian: workaround the bug in dpkg-maintscript-helper
+
+see https://bugs.launchpad.net/ubuntu/+source/snap-confine/+bug/1605052
+and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819
+
+Fixes: http://tracker.ceph.com/issues/20453
+Signed-off-by: Kefu Chai <kchai@redhat.com>
+---
+ debian/ceph-base.maintscript | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
+index 38e36d454f87..9afaacbcae1c 100644
+--- a/debian/ceph-base.maintscript
++++ b/debian/ceph-base.maintscript
+@@ -1,2 +1,2 @@
+-rm_conffile /etc/logrotate.d/ceph.logrotate -- "$@"
+-rm_conffile /etc/logrotate.d/ceph -- "$@"
++rm_conffile /etc/logrotate.d/ceph.logrotate
++rm_conffile /etc/logrotate.d/ceph
diff --git a/patches/series b/patches/series
index 27f742349..2bd4ed09a 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,4 @@
 0001-update-changelog.patch
 0002-cmake-disable-version-from-git.patch
 0003-enable-systemd-targets-by-default.patch
+0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch