diff --git a/ChangeLog b/ChangeLog
index 2fffc9dfe2..729497b82e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 19 00:20:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
+
+	* lib/cgi-lib.rb:   deprecated after 1.8.1
+	* lib/getopts.rb:   ditto
+	* lib/importenv.rb: ditto
+	* lib/parsearg.rb:  ditto
+
 Thu Feb 19 00:11:05 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle): 
@@ -11,6 +18,7 @@ Wed Feb 18 22:42:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: improt test_rinda.rb
 
+>>>>>>> 1.2947
 Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/*: should not depend on $KCODE.
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
index bc780ffc4e..33c732660e 100644
--- a/lib/cgi-lib.rb
+++ b/lib/cgi-lib.rb
@@ -1,3 +1,5 @@
+warn "Warning: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
+
 =begin
 
 = simple CGI support library
diff --git a/lib/getopts.rb b/lib/getopts.rb
index 34fb0d6442..1cd6d2f48e 100644
--- a/lib/getopts.rb
+++ b/lib/getopts.rb
@@ -15,6 +15,8 @@
 # rewritten by Akinori MUSHA <knu@ruby-lang.org>
 #
 
+warn "Warning: getopts is deprecated after Ruby 1.8.1; use optparse instead"
+
 $RCS_ID=%q$Header$
 
 
diff --git a/lib/importenv.rb b/lib/importenv.rb
index 435d6f972a..c47fc1f6c5 100644
--- a/lib/importenv.rb
+++ b/lib/importenv.rb
@@ -7,6 +7,8 @@
 #  $USER = "matz"
 #  p ENV["USER"]
 
+warn "Warning: importenv is deprecated after Ruby 1.8.1 (no replacement)"
+
 for k,v in ENV
   next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
   eval <<EOS
diff --git a/lib/parsearg.rb b/lib/parsearg.rb
index d5f3c9638d..9d58be99f6 100644
--- a/lib/parsearg.rb
+++ b/lib/parsearg.rb
@@ -10,6 +10,8 @@
 #	
 #
 
+warn "Warning: parsearg is deprecated after Ruby 1.8.1; use optparse instead"
+
 $RCS_ID=%q$Header$
 
 require "getopts"