diff --git a/ChangeLog b/ChangeLog
index 7811b6362b..4edeebd463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Thu Aug  7 14:40:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* cygwin/GNUmakefile: better --disbale-shared option support.
 
+	* cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+
 Thu Aug  7 14:21:05 2003  Corinna Vinschen  <vinschen@redhat.com>
 
 	* configure.in: Fix Cygwin specific naming of libraries to
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 83f47f984c..5d87139b8d 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -55,3 +55,11 @@ GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 ifeq (@target_os@,mingw32)
 $(OBJS) $(MAINOBJ): win32/win32.h
 endif
+
+ifeq (@target_os@,cygwin)
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
+	@NM@ --extern --defined $(LIBRUBY_A) | \
+	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
+	@DLLWRAP@ --driver-name=$(CC) -s --def=rubydll.def -o $@
+	@rm -f rubydll.def
+endif