diff --git a/Makefile.am b/Makefile.am
index 121d7441..8b260f74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST		= bootstrap.sh LICENSE README-Xen Changelog kernel \
 			  packaging/deb/rules \
 			  packaging/deb/control \
 			  packaging/deb/core-daemon.install.in \
+			  packaging/deb/core-daemon.prerm.in \
 			  packaging/deb/core-gui.install.in \
 			  packaging/rpm/core.spec.in \
 			  packaging/rpm/specfiles.sh
diff --git a/configure.ac b/configure.ac
index 8c541b3c..93c3b917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,6 +342,7 @@ AC_CONFIG_FILES([Makefile
 		daemon/doc/Makefile
 		daemon/doc/conf.py
 		packaging/deb/core-daemon.install
+		packaging/deb/core-daemon.prerm
 		packaging/deb/core-gui.install
 		packaging/rpm/core.spec],)
 AC_OUTPUT
diff --git a/packaging/deb/.gitignore b/packaging/deb/.gitignore
index 412c7333..790c34ec 100644
--- a/packaging/deb/.gitignore
+++ b/packaging/deb/.gitignore
@@ -1,2 +1,3 @@
 core-daemon.install
 core-gui.install
+core-daemon.prerm
diff --git a/packaging/deb/core-daemon.prerm.in b/packaging/deb/core-daemon.prerm.in
new file mode 100644
index 00000000..23512986
--- /dev/null
+++ b/packaging/deb/core-daemon.prerm.in
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+core_daemon_stop()
+{
+    if [ -x /etc/init.d/core-daemon ]; then
+        /etc/init.d/core-daemon stop
+    fi
+
+    if [ -x @SBINDIR@/core-cleanup ]; then
+        @SBINDIR@/core-cleanup
+    fi
+}
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        core_daemon_stop > /dev/null 2>&1
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0