diff -Nru qt4-x11-4.8.7+dfsg/debian/changelog qt4-x11-4.8.7+dfsg/debian/changelog
--- qt4-x11-4.8.7+dfsg/debian/changelog	2016-04-23 00:20:20.000000000 +0000
+++ qt4-x11-4.8.7+dfsg/debian/changelog	2016-04-26 13:43:25.000000000 +0000
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.7+dfsg-5ubuntu4) yakkety; urgency=medium
+
+  * Add one more macro to qt4-x11 moc to fix failing to parse BOOST_JOIN.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 26 Apr 2016 14:42:07 +0100
+
 qt4-x11 (4:4.8.7+dfsg-5ubuntu3) yakkety; urgency=medium
 
   * No-change rebuild for libpng soname change.
diff -Nru qt4-x11-4.8.7+dfsg/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch qt4-x11-4.8.7+dfsg/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
--- qt4-x11-4.8.7+dfsg/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch	2015-05-01 15:48:50.000000000 +0000
+++ qt4-x11-4.8.7+dfsg/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch	2016-04-26 13:42:57.000000000 +0000
@@ -6,10 +6,11 @@
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/1119656
 Applied-Upstream: Qt5 has proper parsing support.
 
-diff -up qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.QTBUG-22829	2013-06-09 17:04:02.762459323 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp	2013-06-09 17:08:20.409680813 -0500
-@@ -188,8 +188,9 @@ int runMoc(int _argc, char **_argv)
+Index: qt4-x11-4.8.7+dfsg/src/tools/moc/main.cpp
+===================================================================
+--- qt4-x11-4.8.7+dfsg.orig/src/tools/moc/main.cpp
++++ qt4-x11-4.8.7+dfsg/src/tools/moc/main.cpp
+@@ -188,8 +188,11 @@ int runMoc(int _argc, char **_argv)
      pp.macros["Q_MOC_RUN"];
      pp.macros["__cplusplus"];
  
@@ -17,6 +18,8 @@
 +    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 
      pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
 +    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    // ditto for boost 1.60
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
  
      QByteArray filename;
      QByteArray output;