diff --git a/.gitignore b/.gitignore
index c2a4f79..224e7f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-pc/
+.pc/
diff --git a/debian/changelog b/debian/changelog
index 25ba425..8258c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ uronode (2.11-1) UNRELEASED; urgency=medium
   * New upstream update
     - Patches Refreshed
   * Removed makefile-install-locations patch
+  * Fixed lots of patch conflicts and funk
   * Added gitlab CI
 
  -- Dave Hibberd <d@vehibberd.com>  Mon, 20 Apr 2020 03:25:08 +0100
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 9530d65..f69f9bc 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -5,9 +5,12 @@ Last-Update: 2017-08-22
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -3,8 +3,11 @@
+@@ -1,10 +1,13 @@
+ all: nodeusers uronode axdigi calibrate @FLEXNET@
+ 
  CC = gcc
- LD = gcc
+-LD = gcc
++LD = $(CC)
  # CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
 -CFLAGS = -DUNIX -g3 -DDEBUG
 -LDFLAGS =
diff --git a/debian/patches/install-dir-creation b/debian/patches/install-dir-creation
index 7ddae71..a0adfb2 100644
--- a/debian/patches/install-dir-creation
+++ b/debian/patches/install-dir-creation
@@ -4,21 +4,7 @@ Last-Update: 2018-02-10
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -3,11 +3,8 @@
- CC = gcc
- LD = gcc
- # CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
--# CFLAGS = -DUNIX -g3 -DDEBUG
--CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
--CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
--CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
--LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-+CFLAGS = -DUNIX -g3 -DDEBUG
-+LDFLAGS =
- LIBS = -lax25 -lax25io
- 
- include Makefile.include
-@@ -38,6 +35,7 @@
+@@ -38,6 +38,7 @@
  	install -b -m 644    -p etc/gateways	 $(VAR_DIR)/flex
  	
  installbin: all
diff --git a/debian/uronode.lintian-overrides b/debian/uronode.lintian-overrides
new file mode 100644
index 0000000..4cfbea2
--- /dev/null
+++ b/debian/uronode.lintian-overrides
@@ -0,0 +1,34 @@
+uronode: file-in-unusual-dir var/ax25/flex/gateways
+uronode: file-in-unusual-dir var/ax25/node/help/bye.hlp                                                            
+uronode: file-in-unusual-dir var/ax25/node/help/color.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/connect.hlp 
+uronode: file-in-unusual-dir var/ax25/node/help/desti.hlp  
+uronode: file-in-unusual-dir var/ax25/node/help/escape.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/finger.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/help.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/host.hlp 
+uronode: file-in-unusual-dir var/ax25/node/help/info.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/jheard.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/jlong.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/links.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/mail.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/message.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/msg.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/netstat.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/nodes.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/ping.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/ports.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/quit.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/rose.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/routes.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/sessions.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/status.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/telnet.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/users.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/version.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/who.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/zconnect.hlp
+uronode: file-in-unusual-dir var/ax25/node/help/ztelnet.hlp
+uronode: file-in-unusual-dir var/ax25/node/lastlog
+uronode: file-in-unusual-dir var/ax25/node/loggedin
+