diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..e0aefbc
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,11 @@
+linbpq (6.0.24.22-2) UNRELEASED; urgency=medium
+
+  This is quite a big update, with config moving from /opt/oarc/bpq/bpq32.cfg to
+  /etc/bpq32.cfg. The system shall do this automatically for you, however
+  computers and their programmers are not perfect.
+
+  I strongly recommend at this point backing up your entire
+  /opt/oarc/bpq/ directory (cp -r /opt/oarc/bpq/ ~/bpq-backup/) before
+  proceeding with the upgrade
+
+ -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 13:30:06 +0000
diff --git a/debian/changelog b/debian/changelog
index 30f55df..1f64997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linbpq (6.0.24.22-2) unstable; urgency=medium
+
+  * Moved config file home, caused chaos 
+
+ -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 14:40:20 +0000
+
 linbpq (6.0.24.22-jammy1) jammy; urgency=medium
 
   * Rebuild for jammy.
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 9667d53..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/opt/oarc/bpq/bpq32.cfg
diff --git a/debian/dirs b/debian/dirs
index 5cac53f..10a5980 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
+usr/sbin
 opt/oarc/bpq
diff --git a/debian/install b/debian/install
index e4a0e92..3367546 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-debian/templates/bpq32.cfg opt/oarc/bpq
+debian/templates/bpq32.cfg etc/
diff --git a/debian/linbpq.links b/debian/linbpq.links
deleted file mode 100644
index 9f1a328..0000000
--- a/debian/linbpq.links
+++ /dev/null
@@ -1 +0,0 @@
-/opt/oarc/bpq/bpq32.cfg /etc/bpq32.cfg
diff --git a/debian/linbpq.service b/debian/linbpq.service
index 34ed587..598393c 100644
--- a/debian/linbpq.service
+++ b/debian/linbpq.service
@@ -2,7 +2,7 @@
 After=network.target
 
 [Service]
-ExecStart=/opt/oarc/bpq/linbpq
+ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/bpq -l /opt/oarc/bpq
 WorkingDirectory=/opt/oarc/bpq
 Restart=always
 User=linbpq
diff --git a/debian/patches/makefile b/debian/patches/makefile
index d663e6c..d2888a9 100644
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -8,8 +8,8 @@
 +#	setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
 +
 +install: 
-+	install -b -m 755  -D -d		debian/linbpq/opt/oarc/bpq
-+	install -b -m 755  -s -p linbpq		debian/linbpq/opt/oarc/bpq
++	install -b -m 755  -D -d		debian/linbpq/usr/sbin
++	install -b -m 755  -s -p linbpq		debian/linbpq/usr/sbin
  
  -include *.d
  
diff --git a/debian/postinst b/debian/postinst
index 4289690..70eac96 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -26,7 +26,7 @@ if [ "$1" = configure ]; then
 # which allows us to install our binaries without the setuid
 # bit.     
 	if command -v setcap > /dev/null; then         
-			setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /opt/oarc/bpq/linbpq
+			setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /usr/sbin/linbpq
 		else
 			echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2
 	fi
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..4dae0eb
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+confile="/etc/bpq32.cfg"
+node="/opt/oarc/bpq/bpq32.cfg"
+
+if [ -L $confile ]; then
+	rm $confile
+	cp $node $confile
+	mv $node $node.bak
+fi