diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b6cfaba
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.pc/
+*.swp
diff --git a/XAprs b/XAprs
deleted file mode 100644
index 7dc9a42..0000000
Binary files a/XAprs and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index 6aaf07b..9fb35a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-linbpq (6.0.24.51-1~hibbian+1) UNRELEASED; urgency=medium
+linbpq (6.0.24.51+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 
   * New upstream import
     - Patches refreshed
+  * Upstream is now repacked to include less files
+  * Big build system review, now using Debian CFLAGS and LDFLAGS
+    - Hardening enabled, mostly
+    - A debug symbols package is now available
 
- -- Dave Hibberd <hibby@debian.org>  Thu, 28 Nov 2024 22:34:23 +0000
+ -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 13:08:38 +0000
 
 linbpq (6.0.24.50-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index c50170a..f03fa34 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Upstream-Name: linBPQ
 Upstream-Contact: John Wiseman G8BPQ <john.wiseman@cantab.net>
 Source: https://www.cantab.net/users/john.wiseman/Documents/
 Files-Excluded: *.vcproj* *.bak *.lib *.dll *.wav *.asm *.vcxproj* *.pdb *.exe
+	.gitignore XAprs
 
 Files: *
 Copyright: 1990-2024 John Wiseman G8BPQ <john.wiseman@cantab.net>
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 3c02626..468a093 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -8,6 +8,4 @@ linbpq: package-contains-empty-directory [opt/oarc/bpq/]
 # Code convenience
 linbpq: spelling-error-in-binary Dont Don't [usr/sbin/linbpq]
 linbpq: spelling-error-in-binary Paramters Parameters [usr/sbin/linbpq]
-linbpq: spelling-error-in-binary WiH With [usr/sbin/linbpq]
-linbpq: spelling-error-in-binary lable label [usr/sbin/linbpq]
 linbpq: spelling-error-in-binary lon long [usr/sbin/linbpq]
diff --git a/debian/patches/makefile b/debian/patches/makefile
index aac6005..f042fd9 100644
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -22,7 +22,7 @@
  linbpq: $(OBJS)
 -	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) $(LDFLAGS) $(LIBS) -o 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
@@ -33,7 +33,7 @@
 -
 +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
diff --git a/debian/patches/secure-by-default.patch b/debian/patches/secure-by-default.patch
deleted file mode 100644
index 996bc6d..0000000
--- a/debian/patches/secure-by-default.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/TelnetV6.c
-+++ b/TelnetV6.c
-@@ -427,6 +427,7 @@
- 		TCP->IPV4 = TRUE;
- 		TCP->SecureTelnet = 1;
- 		strcpy(TCP->CMSServer, "cms.winlink.org");
-+		TCP->SecureTelnet = 1;
- 	}
- 
- 	TNC = TNCInfo[Port];
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index c8e1669..cf1d89f 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -126,3 +126,14 @@
  
  		"<br><br>The Callsign of the Chat Node is not defined here - it is obtained from the bpq32.cfg APPLICATION line corresponding to the Chat Appl Number.<br>\r\n"
  		"<br></div>\n"
+--- a/WebMail.c
++++ b/WebMail.c
+@@ -2020,7 +2020,7 @@
+ 			"document.getElementById('myform').action = '/WebMail/QuoteOriginal' + '?%s';"
+ 			" document.getElementById('myform').submit();}</script>"
+ 			"<input type=button class='btn' onclick='myfunc()' "
+-			"value='Include Orignal Msg'>";
++			"value='Include Original Msg'>";
+ 		
+ 		char Temp[1024];
+ 		char ReplyAddr[128];
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index a39267e..e69de29 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +0,0 @@
-# i don't care that much on this
-linbpq source: source-contains-prebuilt-windows-binary [PG/Loop.exe]
-linbpq source: source-contains-prebuilt-windows-binary [PG/PGTest.exe]
diff --git a/debian/watch b/debian/watch
index b0e50a4..c624871 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts="pgpmode=none,repacksuffix=+repack,repack,compression=xz" \
+opts="pgpmode=none,dversionmangle=s/\+repack//,repacksuffix=+repack,repack,compression=xz" \
 http://127.0.0.1:8000/linbpq-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))