diff --git a/debian/changelog b/debian/changelog
index f67c62da..176d28c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kali-themes (2019.4.2) kali-experimental; urgency=medium
+
+  * Fix debian/kali-theme.preinst
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 23 Oct 2019 10:05:30 +0200
+
 kali-themes (2019.4.1) kali-experimental; urgency=medium
 
   * Add missing Breaks and Replaces desktop-base
diff --git a/debian/kali-theme.preinst b/debian/kali-theme.preinst
index bb1aaaae..d5443575 100644
--- a/debian/kali-theme.preinst
+++ b/debian/kali-theme.preinst
@@ -2,11 +2,18 @@
 
 set -e
 
+DIVERT_FILE="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
+
 case "$1" in
     install)
+	if [ "$(dpkg-divert --listpackage $DIVERT_FILE)" = "kali-defaults" ]; then
+	    dpkg-divert --rename --package kali-defaults \
+		--divert $DIVERT_FILE.original \
+                --remove $DIVERT_FILE
+	fi
 	dpkg-divert --rename --package kali-theme \
-		    --divert /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.original\
-		    --add /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+		    --divert $DIVERT_FILE.original \
+		    --add $DIVERT_FILE
     ;;
 esac