diff --git a/web/configs/version.json b/web/configs/version.json
index dc1302fd7..c4f2e17e1 100644
--- a/web/configs/version.json
+++ b/web/configs/version.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.8.0",
-    "git": "1294",
+    "version": "1.8.1",
+    "git": "1305",
     "dev": true
 }
diff --git a/web/install/includes/sql/data.sql b/web/install/includes/sql/data.sql
index 06bc975b8..6c04f26fe 100644
--- a/web/install/includes/sql/data.sql
+++ b/web/install/includes/sql/data.sql
@@ -43,6 +43,7 @@ INSERT INTO `{prefix}_settings` (`setting`, `value`) VALUES
 ('config.enablesubmit', '1'),
 ('config.exportpublic', '0'),
 ('config.enablepubliccomments', '0'),
+('config.enablegametracker', '0'),
 ('config.enablekickit', '1'),
 ('config.dateformat', 'Y-m-d H:i:s'),
 ('config.theme', 'default'),
diff --git a/web/pages/admin.settings.php b/web/pages/admin.settings.php
index c15be1283..87636f7f4 100644
--- a/web/pages/admin.settings.php
+++ b/web/pages/admin.settings.php
@@ -278,6 +278,8 @@
             $steamloginopt = (isset($_POST['enable_steamlogin']) && $_POST['enable_steamlogin'] == "on" ? 1 : 0);
 
             $publiccomments = (isset($_POST['enable_publiccomments']) && $_POST['enable_publiccomments'] == "on" ? 1 : 0);
+	
+            $gametracker = (isset($_POST['enable_gametracker']) && $_POST['enable_gametracker'] == "on" ? 1 : 0);
 
             $edit = $GLOBALS['db']->Execute("REPLACE INTO " . DB_PREFIX . "_settings (`value`, `setting`) VALUES
 											(" . (int) $exportpub . ", 'config.exportpublic'),
@@ -286,6 +288,7 @@
 											(" . (int) $friendsban . ", 'config.enablefriendsbanning'),
 											(" . (int) $adminrehash . ", 'config.enableadminrehashing'),
 											(" . (int) $publiccomments . ", 'config.enablepubliccomments'),
+											(" . (int) $gametracker . ", 'config.enablegametracker'),
 											(" . (int) $steamloginopt . ", 'config.enablesteamlogin')");
 
 
@@ -369,6 +372,7 @@
 $('enable_adminrehashing').checked = <?=(int)Config::getBool('config.enableadminrehashing');?>;
 $('enable_steamlogin').checked = <?=(int)Config::getBool('config.enablesteamlogin');?>;
 $('enable_publiccomments').checked = <?=(int)Config::getBool('config.enablepubliccomments');?>;
+$('enable_gametracker').checked = <?=(int)Config::getBool('config.enablegametracker');?>;
 $('mail_verify_peer').checked = <?=(int)Config::getBool('smtp.verify_peer');?>;
 
 <?php
diff --git a/web/themes/default/page_admin_settings_features.tpl b/web/themes/default/page_admin_settings_features.tpl
index 429fbe518..f96e6fd5e 100644
--- a/web/themes/default/page_admin_settings_features.tpl
+++ b/web/themes/default/page_admin_settings_features.tpl
@@ -83,6 +83,21 @@
 
         <!-- end public comments -->
 
+        <!-- gametracker support -->
+
+
+        <tr>
+            <td valign="top"><div class="rowdesc">{help_icon title="Enable GameTracker Support" message="Check this box, if you want to enable GameTracker support."}Enable GameTracker Support</div></td>
+            <td>
+                <div align="left">
+                    <input type="checkbox" name="enable_gametracker" id="enable_gametracker" />
+                </div>
+                <div id="enable_gametracker.msg" class="badentry"></div>
+            </td>
+        </tr>
+
+        <!-- end gametracker support -->
+
 
         <tr>
             <td colspan="2" align="center">
diff --git a/web/themes/default/page_servers.tpl b/web/themes/default/page_servers.tpl
index f186dfd95..4ae6dd37a 100644
--- a/web/themes/default/page_servers.tpl
+++ b/web/themes/default/page_servers.tpl
@@ -39,7 +39,10 @@
                                                 <br />
                                                 <br />
                                                 <div align='center'>
-                                                    <p style="font-size: 13px;">{$server.ip}:{$server.port}</p>
+                                                    <p style="font-size: 13px;">{$server.ip}:{$server.port}</p> 
+                                                    {if (Config::getBool('config.enablegametracker')) }
+                                                    <div style='padding-right:13px;'<a href="https://www.gametracker.com/server_info/{$server.ip}:{$server.port}/" target="_blank"><img src="https://cache.gametracker.com/server_info/{$server.ip}:{$server.port}/b_350_20_eaebeb_eaebeb_2a2723_eaebeb.png" border="0" width="350" height="20" alt=""/></a></div>
+                                                    {/if}
                                                     <input type='submit' onclick="document.location = 'steam://connect/{$server.ip}:{$server.port}'" name='button' class='btn game' style='margin:0px;' id='button' value='Join game' />
                                                     <input type='button' onclick="ShowBox('Reloading..','<b>Refreshing the Serverdata...</b><br><i>Please Wait!</i>', 'blue', '', false);document.getElementById('dialog-control').setStyle('display', 'none');xajax_RefreshServer({$server.sid});" name='button' class='btn refresh' style='margin:0;' id='button' value='Refresh' />
                                                 </div>
@@ -51,7 +54,10 @@
                                 <div id="noplayer_{$server.sid}" name="noplayer_{$server.sid}" style="display:none;"><br />
                                     <h2 style="color: #333;">No players in the server</h2><br />
                                     <div align='center'>
-                                        <p style="font-size: 13px;">{$server.ip}:{$server.port}</p>
+                                        <p style="font-size: 13px;">{$server.ip}:{$server.port}</p> 
+                                        {if (Config::getBool('config.enablegametracker')) }
+                                        <div style='padding-right:13px;'><a href="https://www.gametracker.com/server_info/{$server.ip}:{$server.port}/" target="_blank"><img src='https://cache.gametracker.com/server_info/{$server.ip}:{$server.port}/banner_560x95.png'/></a></div>
+                                        {/if}
                                         <input type='submit' onclick="document.location = 'steam://connect/{$server.ip}:{$server.port}'" name='button' class='btn game' style='margin:0;' id='button' value='Join game' />
                                         <input type='button' onclick="ShowBox('Reloading..','<b>Refreshing the Serverdata...</b><br><i>Please Wait!</i>', 'blue', '', false);document.getElementById('dialog-control').setStyle('display', 'none');xajax_RefreshServer({$server.sid});" name='button' class='btn refresh' style='margin:0;' id='button' value='Refresh' /><br /><br />
                                     </div>
diff --git a/web/updater/data/706.php b/web/updater/data/706.php
new file mode 100644
index 000000000..7fdbe15d0
--- /dev/null
+++ b/web/updater/data/706.php
@@ -0,0 +1,11 @@
+<?php
+
+$sql = <<<SQL
+INSERT INTO `:prefix_settings`
+    (`setting`, `value`, `id`) VALUES ('config.enablegametracker', '0', NULL);
+SQL;
+
+$this->dbs->query($sql);
+$this->dbs->execute();
+
+return true;
diff --git a/web/updater/store.json b/web/updater/store.json
index ba1877815..8a4922e68 100644
--- a/web/updater/store.json
+++ b/web/updater/store.json
@@ -38,5 +38,6 @@
     "702": "702.php",
     "703": "703.php",
     "704": "704.php",
-    "705": "705.php"
+    "705": "705.php",
+    "706": "706.php"
 }