diff --git a/ChangeLog b/ChangeLog
index 77371c3ecf..c98062dd9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 24 16:12:33 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (resp_text_code): accepts response codes without
+	  text.  backported from trunk.  [ruby-core:24194]
+
 Tue Nov 24 16:09:41 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (getaddress): rescue exceptions.  [ruby-dev:39451]
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 6162ffa0d0..b42b0d1dea 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -2764,11 +2764,16 @@ module Net
           match(T_SPACE)
           result = ResponseCode.new(name, number)
         else
-          match(T_SPACE)
-          @lex_state = EXPR_CTEXT
-          token = match(T_TEXT)
-          @lex_state = EXPR_BEG
-          result = ResponseCode.new(name, token.value)
+          token = lookahead
+          if token.symbol == T_SPACE
+            shift_token
+            @lex_state = EXPR_CTEXT
+            token = match(T_TEXT)
+            @lex_state = EXPR_BEG
+            result = ResponseCode.new(name, token.value)
+          else
+            result = ResponseCode.new(name, nil)
+          end
         end
         match(T_RBRA)
         @lex_state = EXPR_RTEXT
diff --git a/version.h b/version.h
index 7680b8cbc2..812020db76 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-11-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091124
-#define RUBY_PATCHLEVEL 218
+#define RUBY_PATCHLEVEL 219
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8