diff --git a/CHANGELOG.md b/CHANGELOG.md
index d08c04e9a9..ad72bd878a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 2.0.2 (WiP)
 
+### Packaging
+
+- Add systemd deluged and deluge-web service files to package tarball (#2034)
+
 ### Core
 
 - Fix Python 2 compatiblity issue with SimpleNamespace.
diff --git a/MANIFEST.in b/MANIFEST.in
index c88a56c1b4..d2d970fe61 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,6 +8,7 @@ include version.py
 include gen_web_gettext.py
 
 graft docs/man
+graft packaging/systemd
 
 include deluge/i18n/*.po
 recursive-exclude deluge/i18n *.mo
diff --git a/packaging/systemd/deluge-web.service b/packaging/systemd/deluge-web.service
index 9e8ca5eef9..b74c0ada84 100644
--- a/packaging/systemd/deluge-web.service
+++ b/packaging/systemd/deluge-web.service
@@ -6,9 +6,6 @@ Wants=deluged.service
 
 [Service]
 Type=simple
-
-User=deluge
-Group=deluge
 UMask=027
 
 ExecStart=/usr/bin/deluge-web -d
diff --git a/packaging/systemd/deluged.service b/packaging/systemd/deluged.service
index 7541548d46..fa00de0fea 100644
--- a/packaging/systemd/deluged.service
+++ b/packaging/systemd/deluged.service
@@ -5,8 +5,6 @@ After=network-online.target
 
 [Service]
 Type=simple
-User=deluge
-Group=deluge
 UMask=007
 
 ExecStart=/usr/bin/deluged -d
diff --git a/packaging/systemd/user.conf b/packaging/systemd/user.conf
new file mode 100644
index 0000000000..ae59820c41
--- /dev/null
+++ b/packaging/systemd/user.conf
@@ -0,0 +1,4 @@
+# Override service user
+[Service]
+User=deluge
+Group=deluge