diff --git a/H/Yap.h b/H/Yap.h
index b23941c11..ed91b8656 100644
--- a/H/Yap.h
+++ b/H/Yap.h
@@ -86,6 +86,12 @@
 #endif
 #define inline __inline
 #define YAP_VERSION "Yap-6.0.0"
+
+/* This is also exported in YapInclude.h */
+#ifndef YAPVERSION
+#define YAPVERSION 60000
+#endif
+
 #define BIN_DIR "c:\\Yap\\bin"
 #define LIB_DIR "c:\\Yap\\lib\\Yap"
 #define SHARE_DIR "c:\\Yap\\share\\Yap"
diff --git a/include/YapInterface.h b/include/YapInterface.h
index 5419925be..9a0f3f15f 100644
--- a/include/YapInterface.h
+++ b/include/YapInterface.h
@@ -28,6 +28,10 @@
 
 #define __YAP_PROLOG__ 1
 
+#ifndef YAPVERSION
+#define YAPVERSION 60000
+#endif
+
 #include "yap_structs.h"
 
 #if HAVE_STDARG_H
diff --git a/packages/chr b/packages/chr
index c325e4564..e071f01c1 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit c325e4564bb8d4e32c27f2061df85f13d315974e
+Subproject commit e071f01c1d9015e6d3fabc73092a6e902541485a
diff --git a/packages/jpl b/packages/jpl
index a2d2f0310..eb6d27251 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit a2d2f03107eecd45462cd61a678035132cf06326
+Subproject commit eb6d27251c2548c25e6d37fff2a27a014caaa7aa