diff --git a/pkg/registry/service/storage.go b/pkg/registry/service/storage.go
index 4dd54a3a3ed..bff4545aa53 100644
--- a/pkg/registry/service/storage.go
+++ b/pkg/registry/service/storage.go
@@ -134,7 +134,7 @@ func GetServiceEnvironmentVariables(registry Registry, machine string) ([]api.En
 		return result, err
 	}
 	for _, service := range services.Items {
-		name := strings.ToUpper(service.ID) + "_SERVICE_PORT"
+		name := makeEnvVariableName(service.ID) + "_SERVICE_PORT"
 		value := strconv.Itoa(service.Port)
 		result = append(result, api.EnvVar{Name: name, Value: value})
 		result = append(result, makeLinkVariables(service, machine)...)
@@ -187,15 +187,19 @@ func (rs *RegistryStorage) deleteExternalLoadBalancer(service *api.Service) erro
 	return nil
 }
 
+func makeEnvVariableName(str string) string {
+	return strings.ToUpper(strings.Replace(str, "-", "_", -1))
+}
+
 func makeLinkVariables(service api.Service, machine string) []api.EnvVar {
-	prefix := strings.ToUpper(service.ID)
+	prefix := makeEnvVariableName(service.ID)
 	var port string
 	if service.ContainerPort.Kind == util.IntstrString {
 		port = service.ContainerPort.StrVal
 	} else {
 		port = strconv.Itoa(service.ContainerPort.IntVal)
 	}
-	portPrefix := prefix + "_PORT_" + strings.ToUpper(strings.Replace(port, "-", "_", -1)) + "_TCP"
+	portPrefix := prefix + "_PORT_" + makeEnvVariableName(port) + "_TCP"
 	return []api.EnvVar{
 		{
 			Name:  prefix + "_PORT",
diff --git a/pkg/registry/service/storage_test.go b/pkg/registry/service/storage_test.go
index 92e2c1de794..71a1ecb7570 100644
--- a/pkg/registry/service/storage_test.go
+++ b/pkg/registry/service/storage_test.go
@@ -191,11 +191,19 @@ func TestServiceRegistryDeleteExternal(t *testing.T) {
 
 func TestServiceRegistryMakeLinkVariables(t *testing.T) {
 	service := api.Service{
-		JSONBase:      api.JSONBase{ID: "foo"},
+		JSONBase:      api.JSONBase{ID: "foo-bar"},
 		Selector:      map[string]string{"bar": "baz"},
 		ContainerPort: util.IntOrString{Kind: util.IntstrString, StrVal: "a-b-c"},
 	}
-	vars := makeLinkVariables(service, "mars")
+	registry := registrytest.NewServiceRegistry()
+	registry.List = api.ServiceList{
+		Items: []api.Service{service},
+	}
+	machine := "machine"
+	vars, err := GetServiceEnvironmentVariables(registry, machine)
+	if err != nil {
+		t.Errorf("unexpected err: %v", err)
+	}
 	for _, v := range vars {
 		if !util.IsCIdentifier(v.Name) {
 			t.Errorf("Environment variable name is not valid: %v", v.Name)