diff --git a/Tools/generate_listener.py b/Tools/generate_listener.py
index 1ebb316baf..df46df3ade 100755
--- a/Tools/generate_listener.py
+++ b/Tools/generate_listener.py
@@ -111,6 +111,10 @@ print("""
 #define PRIu64 "llu"
 #endif
 
+#ifndef PRI64
+#define PRI64 "ll"
+#endif
+
 """)
 for m in messages:
 	print("#include <uORB/topics/%s.h>" % m)
diff --git a/src/lib/uavcan b/src/lib/uavcan
index 86c3397b1b..8effe93d6e 160000
--- a/src/lib/uavcan
+++ b/src/lib/uavcan
@@ -1 +1 @@
-Subproject commit 86c3397b1b423eeed86f21c8b08c8acfbd5add96
+Subproject commit 8effe93d6ee055d9169c1ba460064c90a50eddf1