@@ -63,6 +63,7 @@ type Helper struct {

 // StartOptions represent the parameters sent to the start command

 type StartOptions struct {

 	ServerIP           string

+	RouterIP           string

 	DNSPort            int

 	UseSharedVolume    bool

 	SetPropagationMode bool

@@ -289,7 +290,7 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {

 		if err != nil {

 			return "", errors.NewError("could not copy OpenShift configuration").WithCause(err)

 		}

-		err = h.updateConfig(configDir, opt.HostConfigDir, opt.ServerIP, opt.MetricsHost)

+		err = h.updateConfig(configDir, opt.HostConfigDir, opt.RouterIP, opt.MetricsHost)

 		if err != nil {

 			cleanupConfig()

 			return "", errors.NewError("could not update OpenShift configuration").WithCause(err)

@@ -443,7 +444,7 @@ func (h *Helper) copyConfig(hostDir string) (string, error) {

 	return filepath.Join(tempDir, filepath.Base(hostDir)), nil

 }

-func (h *Helper) updateConfig(configDir, hostDir, serverIP, metricsHost string) error {

+func (h *Helper) updateConfig(configDir, hostDir, routerIP, metricsHost string) error {

 	masterConfig := filepath.Join(configDir, "master", "master-config.yaml")

 	glog.V(1).Infof("Reading master config from %s", masterConfig)

 	cfg, err := configapilatest.ReadMasterConfig(masterConfig)

@@ -455,7 +456,7 @@ func (h *Helper) updateConfig(configDir, hostDir, serverIP, metricsHost string)

 	if len(h.routingSuffix) > 0 {

 		cfg.RoutingConfig.Subdomain = h.routingSuffix

 	} else {

-		cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.xip.io", serverIP)

+		cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.xip.io", routerIP)

 	}

 	if len(metricsHost) > 0 && cfg.AssetConfig != nil {

@@ -63,7 +63,7 @@ func (h *Helper) startSocatTunnel() error {

 	if err != nil {

 		glog.V(1).Infof("error: cannot kill socat: %v", err)

 	}

-	cmd := exec.Command("socat", "TCP-L:8443,reuseaddr,fork,backlog=20", "SYSTEM:\"docker exec -i origin socat - TCP\\:localhost\\:8443,nodelay\"")

+	cmd := exec.Command("socat", "TCP-L:8443,reuseaddr,fork,backlog=20,bind=127.0.0.1", "SYSTEM:\"docker exec -i origin socat - TCP\\:localhost\\:8443,nodelay\"")

 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}

 	err = cmd.Start()

 	if err != nil {

@@ -172,6 +172,7 @@ type ClientStartConfig struct {

 	Tasks              []task

 	HostName           string

 	ServerIP           string

+	RouterIP           string

 	CACert             string

 	PublicHostname     string

 	RoutingSuffix      string

@@ -588,8 +589,14 @@ func (c *ClientStartConfig) DetermineServerIP(out io.Writer) error {

 	if err != nil {

 		return errors.NewError("cannot determine a server IP to use").WithCause(err)

 	}

-	c.ServerIP = ip

-	fmt.Fprintf(out, "Using %s as the server IP\n", ip)

+	if c.PortForwarding {

+		c.ServerIP = "127.0.0.1"

+		c.RouterIP = ip

+	} else {

+		c.ServerIP = ip

+		c.RouterIP = ip

+	}

+	fmt.Fprintf(out, "Using %s as the server IP\n", c.ServerIP)

 	return nil

 }

@@ -598,6 +605,7 @@ func (c *ClientStartConfig) StartOpenShift(out io.Writer) error {

 	var err error

 	opt := &openshift.StartOptions{

 		ServerIP:           c.ServerIP,

+		RouterIP:           c.RouterIP,

 		UseSharedVolume:    !c.UseNsenterMount,

 		SetPropagationMode: c.SetPropagationMode,

 		Images:             c.imageFormat(),

@@ -644,7 +652,7 @@ func (c *ClientStartConfig) InstallRouter(out io.Writer) error {

 	if err != nil {

 		return err

 	}

-	return c.OpenShiftHelper().InstallRouter(kubeClient, f, c.LocalConfigDir, c.imageFormat(), c.ServerIP, c.PortForwarding, out)

+	return c.OpenShiftHelper().InstallRouter(kubeClient, f, c.LocalConfigDir, c.imageFormat(), c.RouterIP, c.PortForwarding, out)

 }

 // ImportImageStreams imports default image streams into the server

@@ -814,27 +822,7 @@ func (c *ClientStartConfig) determineIP(out io.Writer) (string, error) {

 		if err != nil {

 			return "", errors.NewError("cannot determine local IP address").WithCause(err)

 		}

-		glog.V(2).Infof("Testing local IP %s", ip4.String())

-		err = c.OpenShiftHelper().TestForwardedIP(ip4.String())

-		if err == nil {

-			return ip4.String(), nil

-		}

-		glog.V(2).Infof("Failed to use %s: %v", ip4.String(), err)

-		otherIPs, err := cmdutil.AllLocalIP4()

-		if err != nil {

-			return "", errors.NewError("cannot find local IP addresses to test").WithCause(err)

-		}

-		for _, ip := range otherIPs {

-			if ip.String() == ip4.String() {

-				continue

-			}

-			err = c.OpenShiftHelper().TestForwardedIP(ip.String())

-			if err == nil {

-				return ip.String(), nil

-			}

-			glog.V(2).Infof("Failed to use %s: %v", ip.String(), err)

-		}

-		return "", errors.NewError("could not determine local IP address to use").WithCause(err)

+		return ip4.String(), nil

 	}

 	// First, try to get the host from the DOCKER_HOST if communicating via tcp