diff --git a/client.js b/client.js
index bb82a891..af750e09 100644
--- a/client.js
+++ b/client.js
@@ -20,6 +20,13 @@ const stringUtils = require("lib/stringUtils.js");
 const configManager = require("lib/manager/configManager.js");
 const hashFile = require('lib/hash').hashFile;
 
+console.warn(`
++==========================================================+
+I WARNING:  This is the development branch for the 2.0     I
+I           version of clusterio.  Expect things to break. I
++==========================================================+
+`);
+
 // argument parsing
 const args = require('minimist')(process.argv.slice(2));
 
diff --git a/master.js b/master.js
index bc63a58c..dc68b2a4 100644
--- a/master.js
+++ b/master.js
@@ -972,6 +972,13 @@ async function startServer() {
 module.exports = app;
 
 if (module === require.main) {
+	console.warn(`
++==========================================================+
+I WARNING:  This is the development branch for the 2.0     I
+I           version of clusterio.  Expect things to break. I
++==========================================================+
+`
+	);
 	startServer().catch(err => {
 		if (!(err instanceof StartupError)) {
 			console.error(`