diff --git a/package/clixon/clixon.mk b/package/clixon/clixon.mk
index e4ec93a7..71d8872c 100644
--- a/package/clixon/clixon.mk
+++ b/package/clixon/clixon.mk
@@ -64,4 +64,9 @@ endef
 CLIXON_POST_INSTALL_TARGET_HOOKS += CLIXON_INSTALL_EXAMPLE
 endif
 
+define CLIXON_INSTALL_CLEANUP
+	rm -f $(TARGET_DIR)/var/clixon
+endef
+CLIXON_POST_INSTALL_TARGET_HOOKS += CLIXON_INSTALL_CLEANUP
+
 $(eval $(autotools-package))
diff --git a/package/mech/mech.mk b/package/mech/mech.mk
index 294783de..48b7c1ee 100644
--- a/package/mech/mech.mk
+++ b/package/mech/mech.mk
@@ -13,6 +13,7 @@ MECH_AUTORECONF = YES
 define MECH_INSTALL_EXTRA
 	cp $(MECH_PKGDIR)/clixon.conf   $(FINIT_D)/available/
 	ln -sf ../available/clixon.conf $(FINIT_D)/enabled/clixon.conf
+	cp $(MECH_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/mech.conf
 endef
 MECH_TARGET_FINALIZE_HOOKS += MECH_INSTALL_EXTRA
 
diff --git a/package/mech/tmpfiles.conf b/package/mech/tmpfiles.conf
new file mode 100644
index 00000000..6356a630
--- /dev/null
+++ b/package/mech/tmpfiles.conf
@@ -0,0 +1 @@
+d  /run/clixon	- - -