diff --git a/debian/changelog b/debian/changelog
index e9695751..33233a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.541) UNRELEASED; urgency=medium
+
+  * Remove device nodes from Docker images. (LP: #1645468) 
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org>  Wed, 26 Sep 2018 12:43:23 +1200
+
 livecd-rootfs (2.540) cosmic; urgency=medium
 
   * Ensure /lib/modules exists in root tarballs and sqashfs.
diff --git a/live-build/auto/build b/live-build/auto/build
index 70088cf1..4b6fdc2e 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -266,6 +266,11 @@ EOF
 		# Save even more size by removing apt lists (that are currently removed
 		# downstream anyway)
 		rm -rf chroot/var/lib/apt/lists/*
+		# Having device notes in the docker image can cause problems
+		# (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
+		# so remove them.  We only do this for docker out of an
+		# abundance of caution.
+		rm -rf chroot/dev/*
 	fi
 
 	if [ -f config/universe-enabled ]; then