diff --git a/ChangeLog b/ChangeLog
index f542a8b5c1..64071007c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 15 12:30:10 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/zlib/zlib.c (Init_zlib):  Added Zlib::TEXT and note that
+	  Zlib::ASCII is deprecated in zlib 1.2.3 and newer.
+
 Wed Feb 15 12:24:40 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* ext/zlib/zlib.c:  Move constant descriptions to constants.  Remove
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 53389ab7a7..82a198f19f 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -4056,10 +4056,20 @@ Init_zlib()
     rb_define_const(mZlib, "BINARY", INT2FIX(Z_BINARY));
 
     /* Represents text data as guessed by deflate.
+     *
+     * NOTE: The underlying constant Z_ASCII was deprecated in favor of Z_TEXT
+     * in zlib 1.2.2.  New applications should not use this constant.
      *
      * See Zlib::Deflate#data_type. */
     rb_define_const(mZlib, "ASCII", INT2FIX(Z_ASCII));
 
+#ifdef Z_TEXT
+    /* Represents text data as guessed by deflate.
+     *
+     * See Zlib::Deflate#data_type. */
+    rb_define_const(mZlib, "TEXT", INT2FIX(Z_TEXT));
+#endif
+
     /* Represents an unknown data type as guessed by deflate.
      *
      * See Zlib::Deflate#data_type. */