diff --git a/configure b/configure
index b138ca4..f6044fe 100755
--- a/configure
+++ b/configure
@@ -138,11 +138,7 @@ EOF
 build_mk_create() {
     if [ "$DEBUG" = 1 ]; then
         cat <<'EOF' > "$1"
-CGFLAGS		= -g -fno-inline
-EOF
-    else
-        cat <<'EOF' > "$1"
-CGFLAGS		=
+CFLAGS_DEBUG	= -g -fno-inline
 EOF
     fi
 
@@ -163,9 +159,10 @@ EOF
     esac
 
     cat <<'EOF' >> "$1"
-CWFLAGS		= -Wall
-COFLAGS		= -O2
-CFLAGS		= $(CGFLAGS) $(CWFLAGS) $(COFLAGS)
+CFLAGS_WARN	= -Wall
+CFLAGS_OPT	= -O2
+CFLAGS_GEN	= -fPIC
+CFLAGS		= $(CFLAGS_DEBUG) $(CFLAGS_WARN) $(CFLAGS_OPT) $(CFLAGS_GEN)
 
 AR		= $(CROSS)ar
 RANLIB		= $(CROSS)ranlib
diff --git a/src/Makefile b/src/Makefile
index 24fd991..b97cf0f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,9 +3,9 @@ include ../mk/build.mk
 INCLUDE_PATH	= ../include
 HEADERS_SUBDIR	= patty
 
-CC		= $(CROSS)cc
-CFLAGS		= $(CGFLAGS) -fPIC -Wall -O2 -I$(INCLUDE_PATH)
-LDFLAGS		= -lutil
+CC		 = $(CROSS)cc
+CFLAGS		+= -I$(INCLUDE_PATH)
+LDFLAGS		 = -lutil
 
 HEADERS		= kiss.h kiss/tnc.h ax25/aprs_is.h ax25.h client.h ax25/if.h \
 		  ax25/frame.h ax25/sock.h ax25/route.h ax25/server.h daemon.h \