diff --git a/python3/Makefile b/python3/Makefile
index 4d97bacc1fa..d31aa4f497d 100644
--- a/python3/Makefile
+++ b/python3/Makefile
@@ -11,6 +11,8 @@ install:
 	$(IPROG) -d $(DESTDIR)$(SITE3_DIR)
 	$(IPROG) -d $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) -d $(DESTDIR)$(PLUGINDIR)
+	$(IPROG) -d $(DESTDIR)/etc/sysconfig
+	$(IPROG) -d $(DESTDIR)/usr/lib/systemd/system
 
 	
 	$(IDATA) packages/inventory.py $(DESTDIR)$(SITE3_DIR)/
@@ -32,6 +34,11 @@ install:
 	$(IPROG) plugins/disk-space $(DESTDIR)$(PLUGINDIR)
 	$(IPROG) plugins/install-supp-pack $(DESTDIR)$(PLUGINDIR)
 	$(IPROG) plugins/echo.py $(DESTDIR)$(PLUGINDIR)/echo
+
+	$(IPROG) perfmon/perfmon $(DESTDIR)$(PLUGINDIR)
+	$(IDATA) perfmon/perfmon.service $(DESTDIR)/usr/lib/systemd/system/perfmon.service
+	$(IPROG) perfmon/sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon
+
 # templates
 	$(IPROG) templates/debian $(DESTDIR)$(OPTDIR)/packages/post-install-scripts/debian-etch
 	$(IPROG) templates/debug $(DESTDIR)$(OPTDIR)/packages/post-install-scripts
diff --git a/scripts/plugins/perfmon b/python3/perfmon/perfmon
similarity index 100%
rename from scripts/plugins/perfmon
rename to python3/perfmon/perfmon
index e3dc2452691..c40eb659cf6 100644
--- a/scripts/plugins/perfmon
+++ b/python3/perfmon/perfmon
@@ -2,9 +2,9 @@
 #
 # A plugin for requesting perfmon actions via the xe host-call-plugin mechanism
 
-import XenAPIPlugin
 import os
 import socket
+import XenAPIPlugin
 
 # TODO: put this info plus all the supported cmds in a shared file
 cmdsockname = "\0perfmon"  # an af_unix socket name (the "\0" stops socket.bind() creating a fs node)
diff --git a/scripts/perfmon.service b/python3/perfmon/perfmon.service
similarity index 100%
rename from scripts/perfmon.service
rename to python3/perfmon/perfmon.service
diff --git a/scripts/sysconfig-perfmon b/python3/perfmon/sysconfig-perfmon
similarity index 100%
rename from scripts/sysconfig-perfmon
rename to python3/perfmon/sysconfig-perfmon
diff --git a/scripts/Makefile b/scripts/Makefile
index 0234d6ffd1a..91b232a834e 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -61,7 +61,6 @@ install:
 	$(IDATA) cdrommon@.service $(DESTDIR)/usr/lib/systemd/system/cdrommon@.service
 	$(IDATA) gencert.service $(DESTDIR)/usr/lib/systemd/system/gencert.service
 	$(IDATA) xapi-domains.service $(DESTDIR)/usr/lib/systemd/system/xapi-domains.service
-	$(IDATA) perfmon.service $(DESTDIR)/usr/lib/systemd/system/perfmon.service
 	$(IDATA) generate-iscsi-iqn.service $(DESTDIR)/usr/lib/systemd/system/generate-iscsi-iqn.service
 	$(IDATA) xapi.service $(DESTDIR)/usr/lib/systemd/system/xapi.service
 	$(IDATA) attach-static-vdis.service $(DESTDIR)/usr/lib/systemd/system/attach-static-vdis.service
@@ -115,14 +114,11 @@ install:
 	$(IPROG) restore-sr-metadata.py $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) backup-metadata-cron $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) pbis-force-domain-leave $(DESTDIR)$(LIBEXECDIR)
-	mkdir -p $(DESTDIR)/etc/sysconfig
-	$(IPROG) sysconfig-perfmon $(DESTDIR)/etc/sysconfig/perfmon
 	mkdir -p $(DESTDIR)$(EXTENSIONDIR)
 	$(IPROG) extensions/Test.test $(DESTDIR)$(EXTENSIONDIR)
 	$(IPROG) extensions/pool_update.precheck $(DESTDIR)$(EXTENSIONDIR)
 	$(IPROG) extensions/pool_update.apply $(DESTDIR)$(EXTENSIONDIR)
 	mkdir -p $(DESTDIR)$(PLUGINDIR)
-	$(IPROG) plugins/perfmon $(DESTDIR)$(PLUGINDIR)
 	$(IPROG) plugins/extauth-hook $(DESTDIR)$(PLUGINDIR)
 	$(IPROG) plugins/extauth-hook-AD.py $(DESTDIR)$(PLUGINDIR)
 	$(IPROG) plugins/firewall-port $(DESTDIR)$(PLUGINDIR)