diff --git a/bin/Makefile b/bin/Makefile
index 12c2ddc..5726400 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -6,7 +6,7 @@ INCLUDE_PATH	= ../include
 HEADERS_SUBDIR	= patty/bin
 
 CFLAGS		+= -I$(INCLUDE_PATH)
-LDFLAGS		= -L../src -lpatty
+LDFLAGS		+= -L../src -lpatty
 
 PROGRAMS	= pattyd ax25dump tncd
 MAN8PAGES	= pattyd.8 ax25dump.8 tncd.8
diff --git a/configure b/configure
index f6044fe..1dda04a 100755
--- a/configure
+++ b/configure
@@ -85,7 +85,7 @@ EOF
 
 build_mk_append_generic() {
     cat <<'EOF' >> "$1"
-LLFLAGS		= -shared -Wl,-soname=$(SONAME)
+LDFLAGS_SO	= -shared -Wl,-soname=$(SONAME)
 
 STATIC		= lib$(LIBNAME).a
 
@@ -120,7 +120,7 @@ EOF
 
 build_mk_append_darwin() {
     cat <<'EOF' >> "$1"
-LLFLAGS		= -dynamiclib -current_version $(VERSION)
+LDFLAGS_SO	= -dynamiclib -current_version $(VERSION)
 
 STATIC      = lib$(LIBNAME).a
 
@@ -139,6 +139,10 @@ build_mk_create() {
     if [ "$DEBUG" = 1 ]; then
         cat <<'EOF' > "$1"
 CFLAGS_DEBUG	= -g -fno-inline
+EOF
+    else
+        cat <<'EOF' > "$1"
+CFLAGS_DEBUG	=
 EOF
     fi
 
diff --git a/examples/Makefile b/examples/Makefile
index 4ba28c0..e1336f5 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -5,7 +5,7 @@ CC		= $(CROSS)cc
 INCLUDE_PATH	= ../include
 
 CFLAGS		+= -I$(INCLUDE_PATH)
-LDFLAGS		= -L../src -lpatty -lutil
+LDFLAGS		+= -L../src -lpatty -lutil
 
 EXAMPLES	= connect listen login
 
diff --git a/src/Makefile b/src/Makefile
index b97cf0f..45b1139 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,7 @@ HEADERS_SUBDIR	= patty
 
 CC		 = $(CROSS)cc
 CFLAGS		+= -I$(INCLUDE_PATH)
-LDFLAGS		 = -lutil
+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 \
@@ -30,7 +30,7 @@ $(STATIC): $(OBJS)
 	$(RANLIB) $(STATIC)
 
 $(SONAME_FULL): $(OBJS)
-	$(CC) $(LLFLAGS) $(OBJS) $(LDFLAGS) -o $(SONAME_FULL)
+	$(CC) $(OBJS) $(LDFLAGS_SO) $(LDFLAGS) -o $(SONAME_FULL)
 
 $(SONAME): $(SONAME_FULL)
 	$(LN) -s $< $@