diff --git a/make_new_gtlds.pl b/make_new_gtlds.pl
index 964a2f7..d377f0b 100755
--- a/make_new_gtlds.pl
+++ b/make_new_gtlds.pl
@@ -11,6 +11,6 @@ while (<>) {
 
 	die "format error: $_" if not /^((?:xn--)?[a-z0-9]+)$/;
 
-	print qq|    ".$_",\n|;
+	print qq|    "$_",\n|;
 }
 
diff --git a/whois.c b/whois.c
index 60d2971..3e454ca 100644
--- a/whois.c
+++ b/whois.c
@@ -1080,8 +1080,8 @@ const char *is_new_gtld(const char *s)
     int i;
 
     for (i = 0; new_gtlds[i]; i++)
-	if (domcmp(s, new_gtlds[i]))
-	    return new_gtlds[i] + 1;
+	if (in_domain(s, new_gtlds[i]))
+	    return new_gtlds[i];
 
     return 0;
 }