diff --git a/BuildLiveCD b/BuildLiveCD
index 508e56a6..fe4aed11 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -97,7 +97,8 @@ fi
 FS="$1"
 shift
 
-lockfile ~/buildLiveCD.lock || exit 1
+# 12 hours should be enough for even the longest build queue to clear.
+lockfile -8 -r$((12 * 60 * 60 / 8)) ~/buildLiveCD.lock || exit 1
 trap "finish" 0
 trap "rm -f ~/buildLiveCD.lock; exit 1" 1 2 3 15
 exec > $BUILD_LOG 2>&1
diff --git a/debian/changelog b/debian/changelog
index 0a86162b..98421f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.135) UNRELEASED; urgency=low
+
+  * BuildLiveCD: Time out lockfile after 12 hours, which should be enough
+    for even the longest build queue to clear.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 22 May 2013 17:32:23 +0100
+
 livecd-rootfs (2.134) saucy; urgency=low
 
   * remove qt5-proper PPA from ubuntu touch builds