diff --git a/config.mk b/config.mk
index 33c2886..3a4ddb8 100644
--- a/config.mk
+++ b/config.mk
@@ -9,17 +9,11 @@ MANPREFIX = ${PREFIX}/share/man
 INCS = -I.
 LIBS = -lc -lutil
 
-# AIX
-#LIBS = -lc
-
-# Solaris
-#LIBS = -lc -lsocket
-
-CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
-
+CPPFLAGS = -D_POSIX_C_SOURCE=200809L
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
 LDFLAGS += ${LIBS}
 
-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall
+DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb
 
-CC = cc
-STRIP = strip
+CC ?= cc
+STRIP ?= strip