diff --git a/GNUmakefile b/GNUmakefile
index aaa57f55..d176f153 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.109 2009-07-14 06:47:12 nicm Exp $
+# $Id: GNUmakefile,v 1.110 2009-07-20 05:40:12 nicm Exp $
 
 .PHONY: clean
 
@@ -11,14 +11,6 @@ CFLAGS+= -DBUILD="\"$(VERSION)\""
 LDFLAGS+= -L/usr/local/lib
 LIBS+= -lcurses
 
-# This sort of sucks but gets rid of the stupid warning and should work on
-# most platforms...
-ifeq ($(shell (LC_ALL=C $(CC) -v 2>&1|awk '/gcc version 4/') || true), )
-CPPFLAGS:= -I. -I- $(CPPFLAGS)
-else
-CPPFLAGS:= -iquote. $(CPPFLAGS)
-endif
-
 ifdef FDEBUG
 CFLAGS+= -g -ggdb -DDEBUG
 CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
@@ -27,6 +19,17 @@ CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
 CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
 endif
 
+# This sort of sucks but gets rid of the stupid warning and should work on
+# most platforms...
+ifeq ($(shell (LC_ALL=C $(CC) -v 2>&1|awk '/gcc version 4/') || true), )
+CPPFLAGS:= -I. -I- $(CPPFLAGS)
+else
+CPPFLAGS:= -iquote. $(CPPFLAGS)
+ifdef FDEBUG
+CFLAGS+= -Wno-pointer-sign
+endif
+endif
+
 PREFIX?= /usr/local
 INSTALLDIR= install -d
 INSTALLBIN= install -g bin -o root -m 555
diff --git a/Makefile b/Makefile
index ba249dbf..307fb73c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.144 2009-07-14 06:47:12 nicm Exp $
+# $Id: Makefile,v 1.145 2009-07-20 05:40:13 nicm Exp $
 
 .SUFFIXES: .c .o
 .PHONY: clean
@@ -12,6 +12,14 @@ CFLAGS+= -DBUILD="\"$(VERSION)\""
 LDFLAGS+= -L/usr/local/lib
 LIBS+= -lcurses
 
+.ifdef FDEBUG
+CFLAGS+= -g -ggdb -DDEBUG
+CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
+CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
+CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
+CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
+.endif
+
 # This sort of sucks but gets rid of the stupid warning and should work on
 # most platforms...
 CCV!= (LC_ALL=C ${CC} -v 2>&1|awk '/gcc version 4/') || true
@@ -19,14 +27,9 @@ CCV!= (LC_ALL=C ${CC} -v 2>&1|awk '/gcc version 4/') || true
 CPPFLAGS:= -I. -I- -I/usr/local/include ${CPPFLAGS}
 .else
 CPPFLAGS:= -iquote. -I/usr/local/include ${CPPFLAGS}
-.endif
-
 .ifdef FDEBUG
-CFLAGS+= -g -ggdb -DDEBUG
-CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
-CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
-CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
-CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
+CFLAGS+= -Wno-pointer-sign
+.endif
 .endif
 
 PREFIX?= /usr/local