diff --git a/debian/changelog b/debian/changelog
index c6cc8b0..ede3c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+linbpq (6.0.24.78+repack-1~hibbian~TRIXIE+1) trixie-hibbian-unstable; urgency=medium
+
+  * New Upstream
+  * New files excluded
+    - No binaries in this release at all maybe!
+  * MINI_BUILDD_OPTION: auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
+
+ -- Dave Hibberd <hibby@debian.org>  Thu, 31 Jul 2025 01:31:38 +0100
+
 linbpq (6.0.24.77+repack-1~hibbian~TRIXIE+1) trixie-hibbian-unstable; urgency=medium
 
   * New upstream version 6.0.24.77+repack
diff --git a/debian/patches/makefile b/debian/patches/makefile
index cd4bfd2..78e2aa3 100644
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -10,46 +10,38 @@
   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 @@
+@@ -17,12 +16,12 @@
  
- #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)
+ # Configuration:
  
- #other OS
+-#Default to Linux
+-	CC = gcc    
+-	LDFLAGS = -Xlinker -Map=output.map -lrt 
++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
++CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
  
-@@ -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: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+-all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                       
++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 @@
+ #other OS
+@@ -74,12 +73,11 @@
  
  
  linbpq: $(OBJS)
--	cc $(OBJS) $(EXTRA_LDFLAGS) -lminiupnpc -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
+-	cc $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -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	
++	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o 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 :
+-clean :
 -	rm *.d
 -	rm linbpq $(OBJS)
-+	$(RM) *.d
-+	$(RM) linbpq $(OBJS)
++install:
++	install -b -m 755  -D -d                debian/linbpq/usr/sbin
++	install -b -m 755  -p linbpq            debian/linbpq/usr/sbin