diff --git a/ChangeLog b/ChangeLog
index fe5b4ad81..f4b66a5c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-18  Steven Borley <steven.borley@virgin.net>
+
+  *  I erroneously ommited a few changes from Dietmar Warning:
+     Fix to src/maths/cmaths/Makefile.am to exclude test programs that don't
+     compile under MinGW. Fix to src/spicelib/devices/dev.c to exclude local
+     isnan() when it exists as a library function.
+     
+  *  Fixes to src/Makefile.am to exclude programs that don't compile under
+     Windows (MinGW). Fix to avoid dependence problem with linking in winmain.o
+
 2005-05-17  Steven Borley <steven.borley@virgin.net>
 
   *  Updates configure.in. Notably this removes the need for acconfig.h (the use
diff --git a/src/Makefile.am b/src/Makefile.am
index ff56e97dd..b3c3135ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,9 +76,12 @@ ngspice_SOURCES = \
 	conf.c \
 	conf.h \
 	ngspice.c
+	
+if WINDOWS
+ngspice_SOURCES += winmain.c
+endif
 
 ngspice_LDADD = \
-	@WINMAIN@ \
 	spice.o \
 	frontend/libfte.a \
 	@WINDISPLIB@ \
@@ -117,8 +120,11 @@ ngnutmeg_SOURCES = \
 	conf.h \
 	ngnutmeg.c
 
+if WINDOWS
+ngnutmeg_SOURCES += winmain.c
+endif
+
 ngnutmeg_LDADD = \
-	@WINMAIN@ \
 	frontend/libfte.a \
 	@WINDISPLIB@ \
 	frontend/plotting/libplotting.a \
@@ -133,12 +139,19 @@ ngnutmeg_LDADD = \
 
 nghelp_SOURCES = nghelp.c
 
+if WINDOWS
+nghelp_SOURCES += winmain.c
+endif
+
 nghelp_LDADD =  \
 	frontend/help/libhlp.a \
 	frontend/parser/libparser.a \
 	frontend/libfte.a \
 	misc/libmisc.a 
 
+## These programs currently fail to build on Windows
+if !WINDOWS 
+	
 ## sconvert:
 
 ngsconvert_SOURCES =  ngsconvert.c
@@ -179,6 +192,8 @@ ngspice.idx: makeidx
 	./makeidx $(srcdir)/ngspice.txt
 
 
+endif !WINDOWS
+
 ## General Includes and libraries: