diff --git a/tools/configure b/tools/configure
index aa8b190250..9069c84e3b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1109,6 +1109,14 @@ voiceconfig () {
         DEFAULT_NOISEFLOOR="500"
         DEFAULT_CHOICE="e"
     fi
+    if [ -n "`findtool espeak-ng`" ]; then
+        ESPEAK="(e)Speak-ng "
+        ESPEAK_OPTS=""
+        DEFAULT_TTS="espeak-ng"
+        DEFAULT_TTS_OPTS=$ESPEAK_OPTS
+        DEFAULT_NOISEFLOOR="500"
+        DEFAULT_CHOICE="e"
+    fi
     if [ -n "`findtool festival`" ]; then
         FESTIVAL="(F)estival "
         FESTIVAL_OPTS=""
diff --git a/tools/voice.pl b/tools/voice.pl
index edb2c9f233..bc076d5386 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -79,30 +79,43 @@ my %festival_lang_map = (
 
 my %gtts_lang_map = (
     'english' => 'en-gb',  # Always first, it's the golden master
+	'czech' => 'cs',   # not supported
 	'deutsch' => 'de',
-	'english-us' => 'en-us',
+        'english-us' => 'en-us',
+	'espanol' => 'es-es',
 	'francais' => 'fr-fr',
-	'greek' => 'gr',
-	'italiano' => 'it',
+        'greek' => 'gr',
+        'magyar' => 'hu',
+        'italiano' => 'it',
+#        'nederlands' => 'nl',  # not supported
 	'norsk' => 'no',
 	'polski' => 'pl',
 	'russian' => 'ru',
 	'slovak' => 'sk',
-	'srpski' => 'sr',
+        'srpski' => 'sr',
+        'svenska' => 'sv',
+        'turkce' => 'tr',
 );
 
 my %espeak_lang_map = (
     'english' => 'en-gb',  # Always first, it's the golden master
+	'czech' => 'cs',
 	'deutsch' => 'de',
-	'english-us' => 'en-us',
+        'english-us' => 'en-us',
+	'espanol' => 'es',
 	'francais' => 'fr-fr',
-#	'greek' => 'gr',
-	'italiano' => 'it',
+	'greek' => 'el',
+        'nederlands' => 'nl',
+        'magyar' => 'hu',
+        'italiano' => 'it',
+        'japanese' => 'ja',
 	'norsk' => 'no',
 	'polski' => 'pl',
 	'russian' => 'ru',
 	'slovak' => 'sk',
-	'srpski' => 'sr',
+        'srpski' => 'sr',
+        'svenska' => 'sv',
+	'turkce' => 'tr',
 );
 
 # Initialize TTS engine. May return an object or value which will be passed