diff --git a/CHANGES b/CHANGES
index 819ae41..9e73a7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ Release 8.1-pre
 * Fixed for cisco-enable if an intial Login/Password is used (thanks to joswr1te for reporting)
 * Added patch by tux-mind for better MySQL compilation and an Android patches and Makefile. Thanks!
 * Added xhydra gtk patch by Petar Kaleychev to support -e r reverse login attempt, thanks!
+* Added patch for teamspeak to better identify server errors and auth failures (thanks to Petar Kaleychev)
 * Fixed a crash in the cisco module (thanks to Anatoly Mamaev for reporting)
 * Small fix for HTTP form module for redirect pages where a S= string match would not work (thanks to mkosmach for reporting)
 * Updated configure to detect subversion packages on current Cygwin
diff --git a/dpl4hydra_full.csv b/dpl4hydra_full.csv
index 21bb776..7d7ce82 100755
--- a/dpl4hydra_full.csv
+++ b/dpl4hydra_full.csv
@@ -787,6 +787,7 @@ axis,StorPoint CDE100,,,root,pass,,,
 axis,StorPoint NAS 100,,,root,pass,,,
 axis,Webcams,,HTTP,root,pass,Admin,,
 axus,AXUS YOTTA,,Multi,,0,Admin,Storage DAS SATA to SCSI/FC,
+axway,synchronization gateway,,,admin,Secret1,Admin,,
 aztech,DSL-600E,,HTTP,admin,admin,Admin,,
 aztech,windows xp, all models,38.4.2,192.168.1.1,admin,admin,,
 backtrack,backtrack 4,,CLI,root,toor,,,
diff --git a/dpl4hydra_local.csv b/dpl4hydra_local.csv
index 21bb776..7d7ce82 100755
--- a/dpl4hydra_local.csv
+++ b/dpl4hydra_local.csv
@@ -787,6 +787,7 @@ axis,StorPoint CDE100,,,root,pass,,,
 axis,StorPoint NAS 100,,,root,pass,,,
 axis,Webcams,,HTTP,root,pass,Admin,,
 axus,AXUS YOTTA,,Multi,,0,Admin,Storage DAS SATA to SCSI/FC,
+axway,synchronization gateway,,,admin,Secret1,Admin,,
 aztech,DSL-600E,,HTTP,admin,admin,Admin,,
 aztech,windows xp, all models,38.4.2,192.168.1.1,admin,admin,,
 backtrack,backtrack 4,,CLI,root,toor,,,
diff --git a/hydra-teamspeak.c b/hydra-teamspeak.c
index 1ca9685..32b06f2 100644
--- a/hydra-teamspeak.c
+++ b/hydra-teamspeak.c
@@ -77,6 +77,13 @@ int start_teamspeak(int s, char *ip, int port, unsigned char options, char *misc
       hydra_report_found_host(port, ip, "teamspeak", fp);
       hydra_completed_pair_found();
     }
+    if (buf[0x4B] != 0) {
+      hydra_report(stderr, "[ERROR] Child with pid %d terminating, can not connect\n", (int) getpid());
+      hydra_child_exit(1);
+    }
+  } else {
+    hydra_report(stderr, "[ERROR] Child with pid %d terminating, can not connect\n", (int) getpid());
+    hydra_child_exit(1);
   }
 
   hydra_completed_pair();