diff --git a/INSTALL b/INSTALL
index 85545ea2d..daff56f0e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,8 +3,8 @@ Known issues
 ============
 
 Fish currently requires a semi-modern GCC version to
-compile. Specifically, GCC 2.95.* won't compile fish, but GCC 3.23
-should work. Fish has not been coded with an C99- or GNU-specific
+compile. Specifically, GCC 2.95.* won't compile fish, but GCC 3.2.3 is
+known to work. Fish has not been coded with an C99- or GNU-specific
 features in mind, so it is hoped that it should be possible to make
 fish work with other compilers. Patches are welcome.
 
@@ -52,7 +52,7 @@ Local install procedure
 =======================
 
 If you have downloaded the darcs repository of fish, you need to run
-autoconf first.
+autoconf to generate the configure script.
 
 To install fish in your own home directory (typically as non-root),
 type:
diff --git a/Makefile.in b/Makefile.in
index 6005e2d7b..a1329e76e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,8 +36,22 @@
 CC := @CC@
 INSTALL:=@INSTALL@
 
-# Compiler flags
-CFLAGS:=@CFLAGS@ -Wall -std=gnu99 -fno-strict-aliasing
+#
+# Compiler flags:
+#
+# -fno-optimize-sibling-calls seems to work around a bug where sending
+# a SIGWINCH to fish on NetBSD causes fish to exit. This is probably
+# either a compiler bug or a libc bug, but this seems to fix things for
+# now. Long term, this should be tracked down and truly fixed, at which
+# point we can remove this silly flag.
+#
+# -fno-strict-aliasing was sent in in a patch from James Vega. The
+# specific problem that this fixes has been lost to me.
+#
+# -Wall is there to keep me on my toes
+#
+
+CFLAGS:=@CFLAGS@ -Wall -fno-strict-aliasing -fno-optimize-sibling-calls
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS:= @LIBS@ @LDFLAGS@ 
 
@@ -197,7 +211,7 @@ all: $(PROGRAMS) user_doc
 .PHONY: all
 
 debug:
-	make fish CFLAGS="-O0 -Wno-unused -Werror -g -Wall -std=gnu99 -fno-strict-aliasing"
+	make fish CFLAGS="-O0 -Wno-unused -Werror -g -Wall -fno-strict-aliasing -fno-optimize-sibling-calls"
 .PHONY: debug
 
 # User documentation, describing the features of the fish shell.