diff --git a/debian/changelog b/debian/changelog
index 1864def..7fbb256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ nut (2.6.5-2) UNRELEASED; urgency=low
   * debian/rules: Alias systemd nut-monitor service file to nut-client to
     prevent it from running twice
   * d/p/0004-fix-systemd-service.patch: Fix systemd service file for Debian
+  * Install tmpfiles conf files to create /run/nut directory during boot
 
   [ Sébastien Villemot ]
   * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older
@@ -21,7 +22,7 @@ nut (2.6.5-2) UNRELEASED; urgency=low
   * Also remove /etc/init.d/nut in nut-client postinst. Thanks to
     Laurent Bigonville for the hint.
 
- -- Laurent Bigonville <bigon@debian.org>  Sat, 26 Jan 2013 00:15:43 +0100
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 26 Jan 2013 00:59:10 +0100
 
 nut (2.6.5-1) experimental; urgency=low
 
diff --git a/debian/nut-client.tmpfiles b/debian/nut-client.tmpfiles
new file mode 100644
index 0000000..bf195cf
--- /dev/null
+++ b/debian/nut-client.tmpfiles
@@ -0,0 +1 @@
+d /run/nut 0770 root nut - -
diff --git a/debian/nut-server.tmpfiles b/debian/nut-server.tmpfiles
new file mode 100644
index 0000000..bf195cf
--- /dev/null
+++ b/debian/nut-server.tmpfiles
@@ -0,0 +1 @@
+d /run/nut 0770 root nut - -
diff --git a/debian/rules b/debian/rules
index 2d6ca9e..425a353 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,12 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
 	install -m 644 -D $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/systemd/system/nut-server.service \
 		$(CURDIR)/debian/nut-server/lib/systemd/system/nut-server.service
 
+	# Install tmpfiles config file to create /run/nut directory
+	install -m 644 -D $(CURDIR)/debian/nut-client.tmpfiles \
+		$(CURDIR)/debian/nut-client/usr/lib/tmpfiles.d/nut-client.conf
+	install -m 644 -D $(CURDIR)/debian/nut-server.tmpfiles \
+		$(CURDIR)/debian/nut-server/usr/lib/tmpfiles.d/nut-server.conf
+
 	# This is needed to avoid services to be started twice (systemd and LSB)
 	mkdir -p $(CURDIR)/debian/nut-client/etc/systemd/system/
 	ln -s /lib/systemd/system/nut-monitor.service \