diff --git a/README.md b/README.md
index 4ce5efe..de24391 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,8 @@ Supported Games
 * Synergy (synergy)
 * Team Fortress 2 (tf2)
 * Team Fortress Classic (tfc)
+* Teamspeak 2 (teamspeak2)
+* Teamspeak 3 (teamspeak3)
 * Terraria (terraria) [[Additional Notes](#terraria)]
 * TrackMania 2 (trackmania2) [[Additional Notes](#nadeo-shootmania--trackmania--etc)]
 * TrackMania Forever (trackmaniaforever) [[Additional Notes](#nadeo-shootmania--trackmania--etc)]
diff --git a/games/teamspeak2.js b/games/teamspeak2.js
index 6f53766..173de76 100644
--- a/games/teamspeak2.js
+++ b/games/teamspeak2.js
@@ -25,8 +25,8 @@ module.exports = require('./protocols/core').extend({
 					var split = data.split('\r\n');
 					split.forEach(function(line) {
 						var equals = line.indexOf('=');
-						var key = line.substr(0,equals);
-						var value = line.substr(equals+1);
+						var key = equals == -1 ? line : line.substr(0,equals);
+						var value = equals == -1 ? '' : line.substr(equals+1);
 						state.raw[key] = value;
 					});
 					c();
diff --git a/games/teamspeak3.js b/games/teamspeak3.js
new file mode 100644
index 0000000..7de23dd
--- /dev/null
+++ b/games/teamspeak3.js
@@ -0,0 +1,83 @@
+var async = require('async');
+
+module.exports = require('./protocols/core').extend({
+	init: function() {
+		this._super();
+		this.pretty = 'Teamspeak 2';
+		this.options.port = 9987;
+		this.options.master_port = 10011;
+	},
+	run: function(state) {
+		var self = this;
+		
+		var port = this.options.port;
+		this.options.port = this.options.master_port;
+		
+		async.series([
+			function(c) {
+				self.sendCommand('use port='+port, function(data) {
+					var split = data.split('\n\r');
+					if(split[0] != 'TS3') self.fatal('Invalid header');
+					c();
+				}, true);
+			},
+			function(c) {
+				self.sendCommand('serverinfo', function(data) {
+					state.raw = data[0];
+					c();
+				});
+			},
+			function(c) {
+				self.sendCommand('clientlist', function(data) {
+					for(var i = 0; i < data.length; i++) {
+						data[i].name = data[i].client_nickname;
+						delete data[i].client_nickname;
+						state.players.push(data[i]);
+					}
+					c();
+				});
+			},
+			function(c) {
+				self.sendCommand('channellist -topic', function(data) {
+					state.raw.channels = data;
+					c();
+				});
+			},
+			function(c) {
+				self.finish(state);
+			}
+		]);
+	},
+	sendCommand: function(cmd,c,raw) {
+		this.tcpSend(cmd+'\x0A', function(buffer) {
+			if(buffer.length < 21) return;
+			if(buffer.slice(-21).toString() != '\n\rerror id=0 msg=ok\n\r') return;
+			var body = buffer.slice(0,-21).toString();
+			
+			var out;
+
+			if(raw) {
+				out = body;
+			} else {
+				var segments = body.split('|');
+				out = [];
+				segments.forEach(function(line) {
+					var split = line.split(' ');
+					var unit = {};
+					split.forEach(function(field) {
+						var equals = field.indexOf('=');
+						var key = equals == -1 ? field : field.substr(0,equals);
+						var value = equals == -1 ? '' : field.substr(equals+1)
+							.replace(/\\s/g,' ').replace(/\\\//g,'/');
+						unit[key] = value;
+					});
+					out.push(unit);
+				});
+			}
+			
+			c(out);
+			
+			return true;
+		});
+	}
+});