diff --git a/elements/debian/bin/map-services b/elements/debian/bin/map-services
index 56429d9bb..1c76303c4 100755
--- a/elements/debian/bin/map-services
+++ b/elements/debian/bin/map-services
@@ -5,3 +5,4 @@ set -o pipefail
 # For Debian map-services is currently a noop
 # We pass through the service name directly
 echo "$@"
+>&2 echo "WARNING: map-services has been deprecated. Please use svc-map."
diff --git a/elements/opensuse/bin/map-services b/elements/opensuse/bin/map-services
index 874c261a3..28d2ae337 100755
--- a/elements/opensuse/bin/map-services
+++ b/elements/opensuse/bin/map-services
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+# dib-lint: disable=indent
 # Copyright 2012 Hewlett-Packard Development Company, L.P.
 # Copyright 2014 SUSE, Inc.
 #
@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from __future__ import print_function
 import os
 import sys
 
@@ -50,6 +51,9 @@ service_map = {
     'nova-scheduler': 'openstack-nova-scheduler',
 }
 
+print("WARNING: map-services has been deprecated.  "
+      "Please use the svc-map element.", file=sys.stderr)
+
 for arg in sys.argv[1:]:
     # We need to support the service name being different when installing from
     # source vs. packages. So, if the requested service file already exists,
diff --git a/elements/redhat-common/bin/map-services b/elements/redhat-common/bin/map-services
index b2b749b9e..d59daeedf 100755
--- a/elements/redhat-common/bin/map-services
+++ b/elements/redhat-common/bin/map-services
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+# dib-lint: disable=indent
 # Copyright 2012 Hewlett-Packard Development Company, L.P.
 # Copyright 2014 Red Hat, Inc.
 #
@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from __future__ import print_function
 import os
 import sys
 
@@ -67,6 +68,9 @@ service_map = {
     'tgt': 'tgtd',
 }
 
+print("WARNING: map-services has been deprecated.  "
+      "Please use the svc-map element.", file=sys.stderr)
+
 for arg in sys.argv[1:]:
     # We need to support the service name being different when installing from
     # source vs. packages. So, if the requested service file already exists,
diff --git a/elements/ubuntu/bin/map-services b/elements/ubuntu/bin/map-services
index 316cf0e91..1a81bb520 100755
--- a/elements/ubuntu/bin/map-services
+++ b/elements/ubuntu/bin/map-services
@@ -5,3 +5,4 @@ set -o pipefail
 # For Ubuntu map-services is currently a noop
 # We pass through the service name directly
 echo "$@"
+>&2 echo "WARNING: map-services has been deprecated. Please use svc-map."