diff --git a/fence-agents.spec b/fence-agents.spec
index bb0f9e3..4f55217 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -76,6 +76,8 @@ Red Hat Fence Agents is a collection of scripts and libraries to handle remote p
 %files common
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
 %{_datadir}/fence
+%exclude %{_datadir}/fence/azure_fence.py
+%exclude %{_datadir}/fence/XenAPI.py
 %{_datadir}/cluster
 %exclude %{_datadir}/cluster/fence_scsi_check*
 %exclude %{_sbindir}/*
@@ -189,6 +191,7 @@ Obsoletes: fence-agents
 The fence-agents-azure-arm package contains a fence agent for Azure Resource Manager instances.
 %files azure-arm
 %{_sbindir}/fence_azure_arm
+%{_datadir}/fence/azure_fence.py
 %{_mandir}/man8/fence_azure_arm.8*
 
 %package bladecenter
@@ -858,6 +861,7 @@ BuildArch: noarch
 The fence-agents-xenapi package contains a fence agent for Citrix XenServer accessed over XenAPI.
 %files xenapi
 %{_sbindir}/fence_xenapi
+%{_datadir}/fence/XenAPI.py
 %{_mandir}/man8/fence_xenapi.8*
 %endif
 
@@ -875,6 +879,7 @@ The fence-agents-zvm package contains a fence agent for IBM z/VM over IP.
 
 %changelog
 #- mark non-compiled packages properly as noarch, restructure excludes
+#- move azure_fence.py and XenAPI.py to respective subpackages from -common
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild