diff --git a/ChangeLog b/ChangeLog
index 03d6c0b4..020ff352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 
     Allow people to specify a list of temp dirs to clean in bootmisc #191807.
 
+    Allow people to specify a list of early mount points which will be mounted
+    at the end of localmount so they can do tmpfs on things like /tmp #181527.
+
   04 Sep 2007; Roy Marples <uberlord@gentoo.org>:
 
     start-stop-daemon now works with userids correctly when a pidfile
diff --git a/conf.d/localmount b/conf.d/localmount
new file mode 100644
index 00000000..eae3c215
--- /dev/null
+++ b/conf.d/localmount
@@ -0,0 +1,7 @@
+# /etc/conf.d/localmount
+
+# A list of mount points you want mounted before any other real
+# services get started.  For example, you may want to define /tmp
+# or /var/tmp as tmpfs mounts in your /etc/fstab and then add those
+# two paths here.
+EARLY_MOUNTS=""
diff --git a/init.d/localmount b/init.d/localmount
index 06a1979f..589ee072 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -143,6 +143,12 @@ start() {
 		eend $?
 	fi
 
+	for x in ${EARLY_MOUNTS} ; do
+		ebegin "Early mounting ${x}"
+		mount ${x}
+		eend $?
+	done
+
 	# Always return 0 - some local mounts may not be critical for boot
 	return 0
 }