diff --git a/CHANGELOG.md b/CHANGELOG.md
index da9aa190..b8797b03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Unreleased - ???
+- Add `array/join`
+- Add `tuple/join`
+
 ## 1.35.2 - 2024-06-16
 - Add `bundle/add-bin` to make installing scripts easier. This also establishes a packaging convention for it.
 - Let range take non-integer values.
diff --git a/src/boot/system_test.c b/src/boot/system_test.c
index 0edcc1e4..aed27b52 100644
--- a/src/boot/system_test.c
+++ b/src/boot/system_test.c
@@ -22,7 +22,7 @@
 
 #include <janet.h>
 #include <assert.h>
-#include <stdio.h>
+#include <string.h>
 #include <math.h>
 
 #include "tests.h"
@@ -35,6 +35,11 @@ int system_test() {
     assert(sizeof(void *) == 8);
 #endif
 
+    /* Check the version defines are self consistent */
+    char version_combined[256];
+    sprintf(version_combined, "%d.%d.%d%s", JANET_VERSION_MAJOR, JANET_VERSION_MINOR, JANET_VERSION_PATCH, JANET_VERSION_EXTRA);
+    assert(!strcmp(JANET_VERSION, version_combined));
+
     /* Reflexive testing and nanbox testing */
     assert(janet_equals(janet_wrap_nil(), janet_wrap_nil()));
     assert(janet_equals(janet_wrap_false(), janet_wrap_false()));
diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h
index d0e94fc3..92dc56cb 100644
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -4,10 +4,10 @@
 #define JANETCONF_H
 
 #define JANET_VERSION_MAJOR 1
-#define JANET_VERSION_MINOR 35
-#define JANET_VERSION_PATCH 2
-#define JANET_VERSION_EXTRA ""
-#define JANET_VERSION "1.35.2"
+#define JANET_VERSION_MINOR 36
+#define JANET_VERSION_PATCH 0
+#define JANET_VERSION_EXTRA "-dev"
+#define JANET_VERSION "1.36.0-dev"
 
 /* #define JANET_BUILD "local" */