diff --git a/demos/qt5/foo.cpp b/demos/qt5/foo.cpp
index a8e05593..f8f8d0e8 100644
--- a/demos/qt5/foo.cpp
+++ b/demos/qt5/foo.cpp
@@ -1,4 +1,4 @@
-// Thomas Nagy, 2011
+// Thomas Nagy, 2011-2016
 
 #include "foo.h"
 
@@ -17,7 +17,4 @@ class Bar_private : public QWidget {
 Bar_private::Bar_private() : QWidget(NULL) {
 }
 
-#if WAF
 #include "foo.moc"
-#include "foo.cpp.moc"
-#endif
diff --git a/demos/qt5/foo.h b/demos/qt5/foo.h
index 1c54ef61..e05b3e99 100644
--- a/demos/qt5/foo.h
+++ b/demos/qt5/foo.h
@@ -1,4 +1,4 @@
-// Thomas Nagy, 2011
+// Thomas Nagy, 2011-2016
 
 #ifndef _FOO
 #define _FOO
diff --git a/waflib/Tools/qt5.py b/waflib/Tools/qt5.py
index 680926f3..a4ab3870 100644
--- a/waflib/Tools/qt5.py
+++ b/waflib/Tools/qt5.py
@@ -543,7 +543,7 @@ def find_qt5_binaries(self):
 	else:
 		self.fatal('Could not find qmake for qt5')
 
-	self.env.QT_INSTALL_BINS = qtbin = self.cmd_and_log(self.env.QMAKE + ['-query', 'QT_INSTALL_BINS']).strip() + os.sep
+	self.env.QT_HOST_BINS = qtbin = self.cmd_and_log(self.env.QMAKE + ['-query', 'QT_HOST_BINS']).strip()
 	paths.insert(0, qtbin)
 
 	def find_bin(lst, var):