diff --git a/ChangeLog b/ChangeLog
index 516aef14ec..cc5038b9a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan  1 18:18:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: better DJGPP support. add GNUmakefile.
+
+	* djgpp/GNUmakefile: new.
+
 Wed Jan  1 04:16:18 2003  Akinori MUSHA  <knu@iDaemons.org>
 
 	* node.h (struct RNode): Change argc from int to long.  Otherwise
@@ -157,7 +163,8 @@ Sat Dec 28 00:34:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* instruby.rb: use getopts.rb.
 
-	* ext/dbm/extconf.rb: substitute ' with ".
+	* ext/dbm/extconf.rb (-DDBM_HDR): substitute ' with " to avoid
+	  a error on Win32.
 
 	* ext/gdbm/gdbm.c: add prototypes to avoid VC++ warnings.
 
diff --git a/configure.in b/configure.in
index 7feac258b4..8390c1154d 100644
--- a/configure.in
+++ b/configure.in
@@ -1180,6 +1180,10 @@ case "$target_os" in
 	;;
 esac
 
+case "$build_os" in
+  *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
+esac
+
 AC_SUBST(LIBRUBY_LDSHARED)
 AC_SUBST(LIBRUBY_DLDFLAGS)
 AC_SUBST(RUBY_INSTALL_NAME)
diff --git a/djgpp/GNUmakefile.in b/djgpp/GNUmakefile.in
new file mode 100644
index 0000000000..0a7e1fb131
--- /dev/null
+++ b/djgpp/GNUmakefile.in
@@ -0,0 +1,2 @@
+include Makefile
+VPATH = $(srcdir) $(srcdir)/missing