diff --git a/package/gluon-core/files/etc/init.d/gluon-core b/package/gluon-core/files/etc/init.d/gluon-core
deleted file mode 100755
index 4c69a5fa..00000000
--- a/package/gluon-core/files/etc/init.d/gluon-core
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=11
-
-
-start() {
-	mkdir -p /var/gluon/dnsmasq.d
-}
diff --git a/package/gluon-core/files/lib/gluon/dnsmasq.d/.keep b/package/gluon-core/files/lib/gluon/dnsmasq.d/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/package/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq b/package/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq
new file mode 100755
index 00000000..3636fbf6
--- /dev/null
+++ b/package/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -e /etc/dnsmasq.conf ]; then
+	sed -i -e '/^conf-dir=\/lib\/gluon\/dnsmasq\.d$/d' -e '/^conf-dir=\/var\/gluon\/dnsmasq\.d$/d' /etc/dnsmasq.conf
+fi
diff --git a/package/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq.d b/package/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq.d
deleted file mode 100755
index ad7f1e2a..00000000
--- a/package/gluon-core/files/lib/gluon/upgrade/core/invariant/010-dnsmasq.d
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo -e 'conf-dir=/lib/gluon/dnsmasq.d\nconf-dir=/var/gluon/dnsmasq.d' > /etc/dnsmasq.conf