diff --git a/ChangeLog b/ChangeLog
index 221903a436d..03f0b0bd59d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-17  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* MAINTAINERS: Move myself to OS Port Maintainers for windows,
+	cygwin, mingw.
+
 2004-12-16  Andrew Stubbs  <andrew.stubbs@st.com>
 
 	* configure.in (sh64-*-*): Reenable gprof.
diff --git a/MAINTAINERS b/MAINTAINERS
index 6eb0a248c19..d5b1c069edb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -100,6 +100,7 @@ RTEMS Ports		Ralf Corsepius		ralf.corsepius@rtems.org
 VxWorks ports		Zack Weinberg		zack@codesourcery.com
 VxWorks ports		Nathan Sidwell		nathan@codesourcery.com
 windows, cygwin, mingw	Christopher Faylor	cgf@gcc.gnu.org
+windows, cygwin, mingw	Danny Smith		dannysmith@users.sourceforge.net
 
 			Language Front Ends Maintainers
 
@@ -294,7 +295,6 @@ Tobias Schl
 Andreas Schwab					schwab@suse.de
 Svein Seldal                                    svein.seldal@solidas.com
 Franz Sirl					franz.sirl-kernel@lauterbach.com
-Danny Smith					dannysmith@users.sourceforge.net
 Michael Sokolov					msokolov@ivan.Harhan.ORG
 Richard Stallman				rms@gnu.org
 Graham Stott					graham.stott@btinternet.com