diff --git a/README.md b/README.md
index d9f3727..c7eda54 100644
--- a/README.md
+++ b/README.md
@@ -254,6 +254,7 @@ Games List
 * Star Wars: Jedi Knight 2 (swjk2) [[Separate Query Port](#separate-query-port)]
 * Star Wars: Republic Commando (swrc) [[Separate Query Port](#separate-query-port)]
 * Starbound (starbound)
+* StarMade (starmade)
 * Suicide Survival (suicidesurvival)
 * SWAT 4 (swat4) [[Separate Query Port](#separate-query-port)]
 * Sven Coop (svencoop)
diff --git a/games.txt b/games.txt
index d2f210d..15da991 100644
--- a/games.txt
+++ b/games.txt
@@ -232,6 +232,7 @@ swjk2|Star Wars: Jedi Knight 2|quake3|port_query=28070
 swrc|Star Wars: Republic Commando|gamespy2|port=7777,port_query=11138
 
 starbound|Starbound|valve|port=21025
+starmade|StarMade|starmade|port=4242
 suicidesurvival|Suicide Survival|valve
 swat4|SWAT 4|gamespy2|port=10480,port_query_offset=2
 svencoop|Sven Coop|valve
diff --git a/protocols/starmade.js b/protocols/starmade.js
new file mode 100644
index 0000000..a47fb8d
--- /dev/null
+++ b/protocols/starmade.js
@@ -0,0 +1,62 @@
+module.exports = require('./core').extend({
+	init: function() {
+		this._super();
+		this.encoding = 'latin1';
+		this.byteorder = 'be';
+	},
+	run: function(state) {
+		var self = this;
+
+		var b = new Buffer([0x00,0x00,0x00,0x09,0x2a,0xff,0xff,0x01,0x6f,0x00,0x00,0x00,0x00]);
+
+		this.tcpSend(b,function(buffer) {
+			var reader = self.reader(buffer);
+
+			if(buffer.length < 4) return false;
+			var packetLength = reader.uint(4);
+			if(buffer.length < packetLength+12) return false;
+
+			var data = [];
+			state.raw.data = data;
+
+			reader.skip(2);
+			while(!reader.done()) {
+				var mark = reader.uint(1);
+				if(mark == 1) {
+					// signed int
+					data.push(reader.int(4));
+				} else if(mark == 3) {
+					// float
+					data.push(reader.float());
+				} else if(mark == 4) {
+					// string
+					var length = reader.uint(2);
+					data.push(reader.string(length));
+				} else if(mark == 6) {
+					// byte
+					data.push(reader.uint(1));
+				}
+			}
+
+			if(data.length < 9) {
+				self.fatal("Not enough units in data packet");
+				return true;
+			}
+
+			if(typeof data[3] == 'number') state.raw.version = data[3];
+			if(typeof data[4] == 'string') state.name = data[4];
+			if(typeof data[5] == 'string') state.raw.description = data[5];
+			if(typeof data[7] == 'number') state.raw.numplayers = data[7];
+			if(typeof data[8] == 'number') state.maxplayers = data[8];
+
+			if('numplayers' in state.raw) {
+				for(var i = 0; i < state.raw.numplayers; i++) {
+					state.players.push({});
+				}
+			}
+
+			self.finish(state);
+			return true;
+		});
+	}
+});