diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
index 4a6e7322830..30dc1305920 100644
--- a/cmd/kube-apiserver/app/server.go
+++ b/cmd/kube-apiserver/app/server.go
@@ -37,6 +37,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	forked "github.com/GoogleCloudPlatform/kubernetes/third_party/forked/coreos/go-etcd/etcd"
@@ -121,7 +122,7 @@ func NewAPIServer() *APIServer {
 
 		RuntimeConfig: make(util.ConfigurationMap),
 		KubeletConfig: client.KubeletConfig{
-			Port:        10250,
+			Port:        ports.KubeletPort,
 			EnableHttps: true,
 			HTTPTimeout: time.Duration(5) * time.Second,
 		},
diff --git a/pkg/registry/minion/rest.go b/pkg/registry/minion/rest.go
index 7080f5c56bd..70daaf1e990 100644
--- a/pkg/registry/minion/rest.go
+++ b/pkg/registry/minion/rest.go
@@ -29,6 +29,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -143,22 +144,20 @@ func ResourceLocation(getter ResourceGetter, connection client.ConnectionInfoGet
 	node := nodeObj.(*api.Node)
 	host := node.Name // TODO: use node's IP, don't expect the name to resolve.
 
-	scheme, port, transport, err := connection.GetConnectionInfo(host)
-	if err != nil {
-		return nil, nil, err
+	if portReq == "" || strconv.Itoa(ports.KubeletPort) == portReq {
+		scheme, port, transport, err := connection.GetConnectionInfo(host)
+		if err != nil {
+			return nil, nil, err
+		}
+		return &url.URL{
+				Scheme: scheme,
+				Host: net.JoinHostPort(
+					host,
+					strconv.FormatUint(uint64(port), 10),
+				),
+			},
+			transport,
+			nil
 	}
-
-	if portReq != "" {
-		return &url.URL{Scheme: scheme, Host: net.JoinHostPort(host, portReq)}, transport, nil
-	}
-
-	return &url.URL{
-			Scheme: scheme,
-			Host: net.JoinHostPort(
-				host,
-				strconv.FormatUint(uint64(port), 10),
-			),
-		},
-		transport,
-		nil
+	return &url.URL{Host: net.JoinHostPort(host, portReq)}, nil, nil
 }