diff --git a/cmd/proxy/proxy.go b/cmd/proxy/proxy.go
index b5132eea42..2a17601ba9 100644
--- a/cmd/proxy/proxy.go
+++ b/cmd/proxy/proxy.go
@@ -33,7 +33,7 @@ var (
 	configFile     = flag.String("configfile", "/tmp/proxy_config", "Configuration file for the proxy")
 	master         = flag.String("master", "", "The address of the Kubernetes API server (optional)")
 	etcdServerList util.StringList
-	address        = flag.String("address", "0.0.0.0", "The address for the proxy server to serve on (set to 0.0.0.0 or \"\" for all interfaces)")
+	bindAddress    = flag.String("bindaddress", "0.0.0.0", "The address for the proxy server to serve on (set to 0.0.0.0 or \"\" for all interfaces)")
 )
 
 func init() {
@@ -85,7 +85,7 @@ func main() {
 	glog.Infof("Using configuration file %s", *configFile)
 
 	loadBalancer := proxy.NewLoadBalancerRR()
-	proxier := proxy.NewProxier(loadBalancer, *address)
+	proxier := proxy.NewProxier(loadBalancer, *bindAddress)
 	// Wire proxier to handle changes to services
 	serviceConfig.RegisterHandler(proxier)
 	// And wire loadBalancer to handle changes to endpoints to services
diff --git a/pkg/proxy/proxier.go b/pkg/proxy/proxier.go
index 788002d9fa..b037d5c138 100644
--- a/pkg/proxy/proxier.go
+++ b/pkg/proxy/proxier.go
@@ -155,7 +155,7 @@ var unusedPortLock sync.Mutex
 func (proxier *Proxier) addServiceOnUnusedPort(service string) (string, error) {
 	unusedPortLock.Lock()
 	defer unusedPortLock.Unlock()
-	l, err := net.Listen("tcp", fmt.Sprintf("%s:0", proxier.address))
+	l, err := net.Listen("tcp", net.JoinHostPort(proxier.address, "0"))
 	if err != nil {
 		return "", err
 	}
@@ -197,7 +197,7 @@ func (proxier *Proxier) OnUpdate(services []api.Service) {
 			proxier.StopProxy(service.ID)
 		}
 		glog.Infof("Adding a new service %s on port %d", service.ID, service.Port)
-		listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", proxier.address, service.Port))
+		listener, err := net.Listen("tcp", net.JoinHostPort(proxier.address, strconv.Itoa(service.Port)))
 		if err != nil {
 			glog.Infof("Failed to start listening for %s on %d", service.ID, service.Port)
 			continue