--- a/makefile
+++ b/makefile
@@ -2,8 +2,7 @@
 
 #	To exclude i2c support run make noi2c
 
-OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pngwutil.o\
- pngread.o pngwrite.o png.o pngerror.o pngget.o pngmem.o APRSIconData.o AISCommon.o\
+OBJS = APRSIconData.o AISCommon.o\
  upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\
  adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \
  Multicast.o ARDOP.o IPCode.o FLDigi.o linether.o CMSAuth.o APRSCode.o BPQtoAGW.o KAMPactor.o\
@@ -19,7 +18,10 @@
 
 #Default to Linux
 	CC = gcc    
-	EXTRA_LDFLAGS = -Xlinker -Map=output.map -lrt -l:libpaho-mqtt3a.a -l:libjansson.a
+
+	CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+	CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
+	LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 #other OS
 
@@ -42,7 +44,8 @@
 
 $(info OS_NAME is $(OS_NAME))
 
-all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)		                       
+all: CFLAGS += -DLINBPQ  -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables
+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng
 all: linbpq
 
 
@@ -54,12 +57,16 @@
 
 
 linbpq: $(OBJS)
-	cc $(OBJS) $(EXTRA_LDFLAGS) -lminiupnpc -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
-	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
+	gcc $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq
+	# sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq	
 
 -include *.d
 
+install:
+	install -b -m 755  -D -d	debian/linbpq/usr/sbin
+	install -b -m 755  -p linbpq	debian/linbpq/usr/sbin
+
 clean :
-	rm *.d
-	rm linbpq $(OBJS)
+	$(RM) *.d
+	$(RM) linbpq $(OBJS)