diff --git a/debian/NEWS b/debian/NEWS
index 31ab585762c4725498279cba08924cd4a321afeb..e23150863a5d5e637f9c659f2d185c2a97e7478a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,15 @@
+strongswan (5.8.4-2) unstable; urgency=medium
+
+  In version 5.8.4-2, the default systemd service file is changed in new
+  installations, from strongswan-starter associated with the ipsec(8) command to
+  strongswan associated with the swanctl(8) command.
+  .
+  Administrators are still able to use the strongswan-starter systemd sevice
+  file in conjuction with ipsec(8). However, the recommendation is to move to
+  strongswan systemd service file and swanctl(8).
+
+ -- Lucas Kanashiro <kanashiro@debian.org>  Mon, 26 Aug 2019 16:29:57 +0200
+
 strongswan (5.8.0-1) unstable; urgency=medium
 
   With 5.8.0, systemd service files for strongSwan have been renamed.
diff --git a/debian/changelog b/debian/changelog
index 4153bfd232eed9b37e4010b05e3947d1ae04acdc..4ae3c10d59722ef7c3fcf412d01c57d347794ea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+strongswan (5.8.4-2) UNRELEASED; urgency=medium
+
+  * Improve the charon-systemd long description
+  * Make strongswan runtime depend on charon-systemd instead of
+    strongswan-starter
+    - Use charon-systemd in daemon DEP-8 test
+    - Depend on strongswan-charon in admin-strongswan-{starter,charon}
+      DEP-8 tests
+  * Create DEP-8 test to check charon-systemd admin executable file
+  * d/NEWS: notify user about the move to charon-systemd in new installations
+
+ -- Lucas Kanashiro <kanashiro@debian.org>  Wed, 17 Jun 2020 15:47:46 -0300
+
 strongswan (5.8.4-1) unstable; urgency=medium
 
   * New upstream version 5.8.4 (Closes: #956446)
diff --git a/debian/control b/debian/control
index 9c0d909885cb705c4c2ba51c6e6018ea8b59e591..b2f28197804c93e972f7c959a2b2d65fdb96f0a2 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Homepage: http://www.strongswan.org
 
 Package: strongswan
 Architecture: all
-Depends: strongswan-charon, strongswan-starter, ${misc:Depends}
+Depends: strongswan-charon, charon-systemd, ${misc:Depends}
 Description: IPsec VPN solution metapackage
  The strongSwan VPN suite uses the native IPsec stack in the standard Linux
  kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -336,4 +336,5 @@ Description: strongSwan IPsec client, systemd support
  The strongSwan VPN suite uses the native IPsec stack in the standard
  Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
  .
- This package contains the charon-systemd files.
+ This package contains the charon-systemd files. It works in conjunction with
+ swanctl command and swanctl.conf file provided by strongswan-swanctl package.
diff --git a/debian/tests/admin-strongswan-charon-systemd b/debian/tests/admin-strongswan-charon-systemd
new file mode 100755
index 0000000000000000000000000000000000000000..4591f31b0ea199504584515615514a5a0c8e363b
--- /dev/null
+++ b/debian/tests/admin-strongswan-charon-systemd
@@ -0,0 +1,17 @@
+#!/bin/sh
+#---------------------------
+# Testing charon-systemd
+#---------------------------
+CMDS="
+/usr/sbin/swanctl
+"
+
+for cmd in $CMDS; do
+	$cmd --help > /dev/null 2>&1
+	RET=$?
+
+	if [ $RET -ne 0 ]; then
+	  echo "ERROR, failed to run ${cmd}" >&2
+	  exit $RET
+	fi
+done
diff --git a/debian/tests/control b/debian/tests/control
index 5b1ebf32c8c64601fa773f4d902be0d80a7d1393..4fa11237697bb63f4bf4053688047811ad46a9f9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,11 @@
 Tests: admin-strongswan-charon admin-strongswan-starter
+Depends: strongswan-charon, strongswan-pki, strongswan-scepclient
+Restrictions: needs-root isolation-container allow-stderr
+
+Tests: admin-strongswan-charon-systemd
 Depends: strongswan, strongswan-pki, strongswan-scepclient
 Restrictions: needs-root isolation-container allow-stderr
 
 Tests: daemon plugins
-Depends: strongswan-starter, libstrongswan-standard-plugins, libstrongswan-extra-plugins, libcharon-extra-plugins
+Depends: charon-systemd, libstrongswan-standard-plugins, libstrongswan-extra-plugins, libcharon-extra-plugins
 Restrictions: needs-root isolation-machine allow-stderr
diff --git a/debian/tests/daemon b/debian/tests/daemon
index 2a8b5e688124e0f00e46eec9f3092a376bcdd76c..fe4621141800a449cbe94c72ebdc030d8d86fffa 100755
--- a/debian/tests/daemon
+++ b/debian/tests/daemon
@@ -2,7 +2,7 @@
 #------------------------
 # Testing starter, charon
 #------------------------
-DAEMONS="starter charon"
+DAEMONS="charon-systemd"
 
 for daemon in $DAEMONS; do
     if pidof -x $daemon > /dev/null; then