3 files changed, 11 insertions, 2 deletions

diff --git a/consolekit.c b/consolekit.c
index 2da3b10f6..f1039e652 100644
--- a/consolekit.c
+++ b/consolekit.c
@@ -46,6 +46,7 @@
 
 #include <ck-connector.h>
 
+#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "channels.h"
 #include "key.h"
diff --git a/debian/changelog b/debian/changelog
index 10464ae42..d0f19f9fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:6.2p1-2) UNRELEASED; urgency=low
+
+  * Fix build failure on Ubuntu:
+    - Include openbsd-compat/sys-queue.h from consolekit.c.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 09 May 2013 00:55:50 +0100
+
 openssh (1:6.2p1-1) unstable; urgency=low
 
   * New upstream release (http://www.openssh.com/txt/release-6.2).
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch
index d67123a1e..0d0a3d9d6 100644
--- a/debian/patches/consolekit.patch
+++ b/debian/patches/consolekit.patch
@@ -1,7 +1,7 @@
 Description: Add support for registering ConsoleKit sessions on login
 Author: Colin Watson <cjwatson@ubuntu.com>
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450
-Last-Updated: 2013-05-07
+Last-Updated: 2013-05-09
 
 Index: b/Makefile.in
 ===================================================================
@@ -228,7 +228,7 @@ Index: b/consolekit.c
 ===================================================================
 --- /dev/null
 +++ b/consolekit.c
-@@ -0,0 +1,239 @@
+@@ -0,0 +1,240 @@
 +/*
 + * Copyright (c) 2008 Colin Watson.  All rights reserved.
 + *
@@ -277,6 +277,7 @@ Index: b/consolekit.c
 +
 +#include <ck-connector.h>
 +
++#include "openbsd-compat/sys-queue.h"
 +#include "xmalloc.h"
 +#include "channels.h"
 +#include "key.h"