diff --git a/debian/changelog b/debian/changelog
index 9e9b543..36df7e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linbpq (6.0.24.50-1~hibbian+2) UNRELEASED; urgency=medium
+
+  * Try building and working with the new build system 
+
+ -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 16:17:44 +0000
+
 linbpq (6.0.24.50-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 
   * New upstream import
diff --git a/debian/control b/debian/control
index a8e17ad..476f114 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 4.7.0.0
 Vcs-Browser: https://github.com/Online-Amateur-Radio-Club-M0OUK/oarc-bpqnode
 Vcs-Git: https://github.com/Online-Amateur-Radio-Club-M0OUK/oarc-bpqnode.git
 Homepage: https://www.cantab.net/users/john.wiseman/Documents/
-Build-Depends: debhelper-compat (= 13), libssl-dev, libminiupnpc-dev, libpcap-dev, libconfig-dev, zlib1g-dev, libpaho-mqtt-dev, libjansson-dev
+Build-Depends: debhelper-compat (= 13), libssl-dev, libminiupnpc-dev, libpcap-dev, libconfig-dev, zlib1g-dev, libpaho-mqtt-dev, libjansson-dev, libpng-dev
 Rules-Requires-Root: no
 
 Package: linbpq
diff --git a/debian/patches/makefile b/debian/patches/makefile
index 00c189c..19cd7e7 100644
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -1,10 +1,38 @@
 --- a/makefile
 +++ b/makefile
-@@ -33,11 +33,14 @@
+@@ -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\
+@@ -18,9 +17,12 @@
+ # Configuration:
+ 
+ CC = gcc
+-		                       
+-all: CFLAGS = -DLINBPQ -MMD -g -fcommon
+-all: LDFLAGS = -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)
++
++all: CFLAGS += -DLINBPQ -MMD -g -fcommon
++all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng 
+ all: linbpq
+ 
+ 
+@@ -32,12 +34,15 @@
+ 
  
  linbpq: $(OBJS)
- 	gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
+-	gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -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) $(CLFAGS) $(LDFLAGS) $(LIBS) -o linbpq
 +	# sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
  
  -include *.d
@@ -12,10 +40,11 @@
 -clean :
 -	rm *.d
 -	rm linbpq $(OBJS)
+-
 +install:
 +	install -b -m 755  -D -d		debian/linbpq/usr/sbin
-+	install -b -m 755  -s -p linbpq		debian/linbpq/usr/sbin
- 
++	install -b -m 755  -p linbpq		debian/linbpq/usr/sbin
++
 +clean:
 +	$(RM) *.d
 +	$(RM) linbpq $(OBJS)
diff --git a/debian/rules b/debian/rules
index b8b1ea0..8affa7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=-all,-format qa=-bug-implicit-func
 
 %:
 	dh $@