diff --git a/elements/fedora/bin/map-services b/elements/fedora/bin/map-services
index 6f04bb410..e52fe3246 100755
--- a/elements/fedora/bin/map-services
+++ b/elements/fedora/bin/map-services
@@ -45,6 +45,7 @@ service_map = {
     'cinder-scheduler': 'openstack-cinder-scheduler',
     'cinder-volume': 'openstack-cinder-volume',
     'tgt': 'tgtd',
+    'libvirt-bin': 'libvirtd',
 }
 
 for arg in sys.argv[1:]:
diff --git a/elements/opensuse/bin/map-services b/elements/opensuse/bin/map-services
index 7bc0db0bf..ee1cd96c6 100755
--- a/elements/opensuse/bin/map-services
+++ b/elements/opensuse/bin/map-services
@@ -23,6 +23,7 @@ import sys
 # distromatch or other rich data sources.
 # Debian name on the left, openSUSE on the right.
 service_map = {
+<<<<<<< HEAD
     # openstack mapping
     'cinder-api': 'openstack-cinder-api',
     'cinder-scheduler': 'openstack-cinder-scheduler',
@@ -48,6 +49,7 @@ service_map = {
     'nova-baremetal-deploy-helper': 'openstack-nova-baremetal-deploy-helper',
     'nova-novncproxy': 'openstack-nova-novncproxy',
     'nova-scheduler': 'openstack-nova-scheduler',
+    'libvirt-bin': 'libvirtd',
 }
 
 for arg in sys.argv[1:]:
diff --git a/elements/rhel/bin/map-packages b/elements/rhel/bin/map-packages
index becd1d28c..260d8a49d 100755
--- a/elements/rhel/bin/map-packages
+++ b/elements/rhel/bin/map-packages
@@ -31,6 +31,7 @@ package_map = {
     'gearman-job-server': 'gearmand',
     'tgt': 'scsi-target-utils',
     'stunnel4': 'stunnel',
+    'libvirt-bin': 'libvirtd',
 }
 
 for arg in sys.argv[1:]: