diff --git a/debian/control b/debian/control
index e7dc057f0d0aa32c6b28e7edd624bba16f0a73a0..d24a2037d07636fb1bf9440d8c86975fe0e76d3d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: pyro5
 Section: python
 Priority: optional
 Maintainer: Bo YU <tsu.yubo@gmail.com>
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/vimerbf-guest/pyro5.git
+Vcs-Browser: https://salsa.debian.org/vimerbf-guest/pyro5
 Homepage: https://github.com/irmen/Pyro5
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 13), python3-all 
@@ -16,7 +18,6 @@ Build-Depends-Indep:
  python3-dill (>= 0.2.6),
  python3-msgpack (>= 0.5.2) <!nocheck>,
  python3-pytest <!nocheck>,
-Build-Conflicts: python-sphinx
 Description: distributed object middleware for Python (RPC)
  Pyro (PYthon Remote Object) is an easy to use and powerful distributed object
  system for Python. In a distributed object system, clients send requests to
@@ -28,23 +29,13 @@ Description: distributed object middleware for Python (RPC)
   - exceptions that occur in the remote object is raised on the client too,
   - multithreaded server support to handle multiple requests simultaneously.
 
-Package: pyro5
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, lsb-base, python3-pyro5
-Description: ${source:Synopsis}
- ${source:Extended-Description}
- .
- This metapackage depends on the on the Python variant the user needs.
- .
- The documentation is available in the pyro5-doc package.
- A lot of examples are available in the pyro5-examples package.
-
 Package: python3-pyro5
 Architecture: all
-Depends: python3-serpent (>= 1.27), ${misc:Depends}, ${python3:Depends}
+Depends: python3-serpent, ${misc:Depends}, ${python3:Depends}
 Conflicts: python3-pyro4
 Replaces: python3-pyro4
-Suggests: pyro5-doc, pyro5
+Provides: pyro5
+Suggests: pyro5-doc
 Description: ${source:Synopsis}
  ${source:Extended-Description}
  .
diff --git a/debian/pyro5-nsd.service b/debian/pyro5-nsd.service
new file mode 100644
index 0000000000000000000000000000000000000000..641a85ab109d0a920695be1f14550f6ed1eb05d1
--- /dev/null
+++ b/debian/pyro5-nsd.service
@@ -0,0 +1,32 @@
+[Unit]
+Description=Pyro name server
+Documentation=man:pyro5-ns(1)
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/pyro5-ns/pyro5-ns.pid
+ExecStart=python3 -m Pyro5.naming -n 0.0.0.0 -p 9090
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectClock=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectHostname=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectSystem=strict
+RestrictNamespaces=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+NoNewPrivileges=yes
+CapabilityBoundingSet=
+SystemCallArchitectures=native
+SystemCallErrorNumber=EPERM
+SystemCallFilter=@system-service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/python3-pyro5.manpages b/debian/python3-pyro5.manpages
new file mode 100644
index 0000000000000000000000000000000000000000..b0b7e48e9fe4ce3c054e81df3b1a99c29e26a56d
--- /dev/null
+++ b/debian/python3-pyro5.manpages
@@ -0,0 +1,4 @@
+debian/manpage/pyro5-echoserver.1
+debian/manpage/pyro5-httpgateway.1
+debian/manpage/pyro5-ns.1
+debian/manpage/pyro5-nsc.1
diff --git a/debian/pyro5.pyro5-nsd.init b/debian/python3-pyro5.pyro5-nsd.init
similarity index 100%
rename from debian/pyro5.pyro5-nsd.init
rename to debian/python3-pyro5.pyro5-nsd.init
diff --git a/debian/rules b/debian/rules
index f2c176f77163646f475c734c5bf09e6e8e891c48..3226719a2b378ec201ba0982455d75eeebefcf0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
 export PYBUILD_NAME=pyro5
 
@@ -8,14 +9,14 @@ EXAMPLESDIR=$(CURDIR)/debian/pyro5-examples/usr/share/doc/pyro5/examples/
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_clean:
+	$(RM) -r $(CURDIR)/Pyro5.egg-info/
+	dh_auto_clean
+
 override_dh_auto_build:
 	dh_auto_build
 	cd $(CURDIR)/docs/ && $(MAKE) html
 
-override_dh_install:
-	dh_install
-	rm -rf $(CURDIR)/debian/python3-pyro5/usr/bin/
-
 override_dh_installdocs:
 	dh_installdocs
 	#find $(DOCDIR) -name \*.html -exec \
@@ -34,4 +35,10 @@ override_dh_fixperms:
 	dh_fixperms
 
 override_dh_installinit:
-	dh_installinit -ppyro5 --name=pyro5-nsd --no-enable
+	dh_installinit -ppython3-pyro5 --name=pyro5-nsd --no-enable
+
+override_dh_installsystemd:
+	dh_installsystemd --name=pyro5-ns --no-enable --no-start
+
+.PHONY: override_dh_auto_clean override_dh_auto_build \
+	override_dh_installdocs override_dh_fixperms
diff --git a/debian/watch b/debian/watch
index 66e117a9fe230e303e42aee949c1e67699632f69..c5526607dbdd37a15fceec1a419f5d5cdab5ad6e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=4
 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/i,\
 dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//i \
-https://github.com/irmen/Pyro4/tags \
-(?:|.*/)v?(\d\S*)@ARCHIVE_EXT@
+https://github.com/irmen/Pyro5/tags \
+(?:|.*/)[vV]?(\d\S*)@ARCHIVE_EXT@