diff --git a/ChangeLog b/ChangeLog
index aaa9cf31cd..2ec71ed0f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
+	  from CVS HEAD)
+
 Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
diff --git a/ruby.c b/ruby.c
index 10a1813d07..763697b2f9 100644
--- a/ruby.c
+++ b/ruby.c
@@ -704,11 +704,11 @@ proc_options(argc, argv)
 
     if (rb_safe_level() == 0 && (s = getenv("RUBYOPT"))) {
 	while (ISSPACE(*s)) s++;
-	if (*s == '-' && *(s+1) == 'T') {
+	if (*s == 'T' || *s == '-' && *(s+1) == 'T') {
 	    int numlen;
 	    int v = 1;
 
-	    s += 2;
+	    if (*s != 'T') ++s;
 	    if (*++s) {
 		v = scan_oct(s, 2, &numlen);
 		if (numlen == 0) v = 1;