diff --git a/debian/davical.postinst b/debian/davical.postinst
index 0f299b32..f38a6a51 100644
--- a/debian/davical.postinst
+++ b/debian/davical.postinst
@@ -14,4 +14,11 @@ case $1 in
     ;;
 esac
 
+dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@"
+
 #DEBHELPER#
+
+# remove leftover /etc/davical/.keep directory, if empty (cf. #584185)
+[ -d /etc/davical/.keep ] && rmdir --ignore-fail-on-non-empty /etc/davical/.keep
+
+exit 0
diff --git a/debian/davical.postrm b/debian/davical.postrm
index 18b25f50..b2075186 100644
--- a/debian/davical.postrm
+++ b/debian/davical.postrm
@@ -7,9 +7,11 @@ PACKAGE=::package::
 
 [ -n "${DEBUG}" ] && echo "PostRM Parameters: $@"
 
-case $1 in
-  purge)
-    ;;
-esac
+dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@"
 
 #DEBHELPER#
+
+# remove leftover /etc/davical/.keep directory, if empty (cf. #584185)
+[ -d /etc/davical/.keep ] && rmdir --ignore-fail-on-non-empty /etc/davical/.keep
+
+exit 0
diff --git a/debian/davical.preinst b/debian/davical.preinst
new file mode 100644
index 00000000..89ab50e2
--- /dev/null
+++ b/debian/davical.preinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/davical/.keep/keepme 1.1.4-1~ davical -- "$@"
+
+#DEBHELPER#