diff --git a/demos/makefile.g95 b/demos/makefile.g95
new file mode 100644
index 0000000000..94d7302028
--- /dev/null
+++ b/demos/makefile.g95
@@ -0,0 +1,27 @@
+#
+# File:		makefile.g95
+# Author:	Julian Smart
+# Created:	1997
+# Updated:	
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds samples for Win95, Cygwin
+# info
+
+# Set WXDIR for your system
+# SHELL=cmd.exe
+WXDIR = ..
+
+THISDIR=$(WXDIR)/demos
+
+# Mingw make may not have a shell to use, so can't use a loop here. Sigh.
+# Please add new sample directories alphabetically to make it easier to
+# keep track.
+all clean:
+	-$(MAKE) -C bombs -f $(MAKEFILE) $@
+	-$(MAKE) -C life -f $(MAKEFILE) $@
+	-$(MAKE) -C forty -f $(MAKEFILE) $@
+	-$(MAKE) -C fractal -f $(MAKEFILE) $@
+	-$(MAKE) -C poem -f $(MAKEFILE) $@
diff --git a/samples/richedit/makefile.g95 b/samples/richedit/makefile.g95
new file mode 100644
index 0000000000..275255562d
--- /dev/null
+++ b/samples/richedit/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../..
+
+TARGET=wxLayout
+OBJECTS = $(TARGET).o kbList.o wxllist.o wxlparser.o wxlwindow.o
+
+include $(WXDIR)/src/makeprog.g95
+