diff --git a/lib/whois/record/parser/whois.thnic.co.th.rb b/lib/whois/record/parser/whois.thnic.co.th.rb
index 3a17ac63d..d2f67b07b 100644
--- a/lib/whois/record/parser/whois.thnic.co.th.rb
+++ b/lib/whois/record/parser/whois.thnic.co.th.rb
@@ -41,7 +41,7 @@ class WhoisThnicCoTh < Base
         end
 
         property_supported :available? do
-          !!(content_for_scanner =~ /^% No entries found for the selected source/)
+          !!(content_for_scanner =~ /^% No match for/)
         end
 
         property_supported :registered? do
@@ -50,19 +50,19 @@ class WhoisThnicCoTh < Base
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /^Created Date: (.+?)\n/
+          if content_for_scanner =~ /^Created date: (.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /^Updated Date: (.+?)\n/
+          if content_for_scanner =~ /^Updated date: (.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /^Exp Date: (.+?)\n/
+          if content_for_scanner =~ /^Exp date: (.+?)\n/
             Time.parse($1)
           end
         end
diff --git a/spec/fixtures/responses/whois.thnic.co.th/status_available.txt b/spec/fixtures/responses/whois.thnic.co.th/status_available.txt
index ae5b212e4..b043001b1 100644
--- a/spec/fixtures/responses/whois.thnic.co.th/status_available.txt
+++ b/spec/fixtures/responses/whois.thnic.co.th/status_available.txt
@@ -1,5 +1,4 @@
 
-Whois Server Version 1.5
-
-% No entries found for the selected source(s).
+Whois Server Version 2.1.0
 
+% No match for "U34JEDZCQ.CO.TH".
\ No newline at end of file
diff --git a/spec/fixtures/responses/whois.thnic.co.th/status_registered.expected b/spec/fixtures/responses/whois.thnic.co.th/status_registered.expected
index 174f547a3..3ce25a766 100644
--- a/spec/fixtures/responses/whois.thnic.co.th/status_registered.expected
+++ b/spec/fixtures/responses/whois.thnic.co.th/status_registered.expected
@@ -14,11 +14,11 @@
 
 #updated_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2010-09-23")
+  should: %s == Time.parse("2012-09-07")
 
 #expires_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2011-10-07")
+  should: %s == Time.parse("2013-10-07")
 
 
 #nameservers
diff --git a/spec/fixtures/responses/whois.thnic.co.th/status_registered.txt b/spec/fixtures/responses/whois.thnic.co.th/status_registered.txt
index 2d215c6e4..54263889e 100644
--- a/spec/fixtures/responses/whois.thnic.co.th/status_registered.txt
+++ b/spec/fixtures/responses/whois.thnic.co.th/status_registered.txt
@@ -1,27 +1,24 @@
 
-Whois Server Version 1.5
+Whois Server Version 2.1.0
 
 Domain: GOOGLE.CO.TH
-ACE: GOOGLE.CO.TH
 Registrar: T.H.NIC Co., Ltd.
 Name Server: NS1.GOOGLE.COM
 Name Server: NS2.GOOGLE.COM
 Name Server: NS3.GOOGLE.COM
 Name Server: NS4.GOOGLE.COM
 Status: ACTIVE
-Updated Date: 23 Sep 2010
-Created Date: 8 Oct 2004
-Renew Date: 8 Oct 2010
-Exp Date: 7 Oct 2011
+Updated date: 7 Sep 2012
+Created date: 8 Oct 2004
+Renew date: 8 Oct 2012
+Exp date: 7 Oct 2013
 Domain Holder: Google Inc.
-            2400 Bayshore Parkway, Mountain Veiw, CA
-            94043
-            US
-
-Tech Contact: 81878
-Google Inc.
-1600 Amphitheatre Parkway,Building 41, Mountain View,CA 94043, U.S.A., California
+2400 Bayshore Parkway, Mountain Veiw, CA
 94043
 US
 
-
+Tech Contact: 13244
+MarkMonitor Inc.
+391 N Ancestor Place, Boise, ID
+83704
+US
\ No newline at end of file
diff --git a/spec/whois/record/parser/responses/whois.thnic.co.th/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.thnic.co.th/status_registered_spec.rb
index 942e54e53..7f07e1f11 100644
--- a/spec/whois/record/parser/responses/whois.thnic.co.th/status_registered_spec.rb
+++ b/spec/whois/record/parser/responses/whois.thnic.co.th/status_registered_spec.rb
@@ -45,13 +45,13 @@
   describe "#updated_on" do
     it do
       subject.updated_on.should be_a(Time)
-      subject.updated_on.should == Time.parse("2010-09-23")
+      subject.updated_on.should == Time.parse("2012-09-07")
     end
   end
   describe "#expires_on" do
     it do
       subject.expires_on.should be_a(Time)
-      subject.expires_on.should == Time.parse("2011-10-07")
+      subject.expires_on.should == Time.parse("2013-10-07")
     end
   end
   describe "#nameservers" do