3 files changed, 15 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 7d91a7a..9f7cb8e 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ patchage (1.0.1) unstable;
   * Restore messages pane visibility and height
   * Configure based on compiler target OS for cross-compilation
   * Fix compilation with Jack DBus
-  * Upgrade to waf 1.8.14
+  * Upgrade to waf 2.0.19
 
  -- David Robillard <d@drobilla.net>  Fri, 14 Oct 2016 19:06:17 -0400
 
diff --git a/waf b/waf
index e22930a..58d14c3 100755
--- a/waf
+++ b/waf
@@ -2,15 +2,26 @@
 
 # Minimal waf script for projects that include waflib directly
 
-from waflib import Context, Scripting
-
+import sys
 import inspect
 import os
 
+try:
+    from waflib import Context, Scripting
+except Exception as e:
+    sys.stderr.write('error: Failed to import waf (%s)\n' % e)
+    if os.path.exists('.git'):
+        sys.stderr.write("Are submodules up to date? "
+                         "Try 'git submodule update --init --recursive'\n")
+
+    sys.exit(1)
+
+
 def main():
     script_path = os.path.abspath(inspect.getfile(inspect.getmodule(main)))
-    project_path = os.path.dirname(script_path)
+    project_path = os.path.dirname(os.path.realpath(script_path))
     Scripting.waf_entry_point(os.getcwd(), Context.WAFVERSION, project_path)
 
+
 if __name__ == '__main__':
     main()
diff --git a/waflib b/waflib
-Subproject de76b89dc1039e2f7d6c6b229a8950156b0e5c9
+Subproject f0bc33348b833b26697df5ba8cd1f9bf5dd9b3c