@@ -177,7 +177,7 @@ func (c *MasterConfig) RunDNSServer() {

 		glog.Fatalf("Could not start DNS: %v", err)

 	}

 	if port != "53" {

-		glog.Warningf("Binding DNS on port %v instead of 53 (you may need to run as root and update your config), using %s which will not resolve from all locations", port, c.Options.DNSConfig.BindAddress)

+		glog.Warningf("Binding DNS on port %v instead of 53, which may not be resolvable from all clients", port)

 	}

 	if ok, err := cmdutil.TryListen(c.Options.DNSConfig.BindNetwork, c.Options.DNSConfig.BindAddress); !ok {

@@ -101,7 +101,7 @@ func NewDefaultMasterArgs() *MasterArgs {

 		MasterAddr:       flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

 		EtcdAddr:         flagtypes.Addr{Value: "0.0.0.0:4001", DefaultScheme: "https", DefaultPort: 4001}.Default(),

 		MasterPublicAddr: flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

-		DNSBindAddr:      flagtypes.Addr{Value: "0.0.0.0:53", DefaultScheme: "tcp", DefaultPort: 53, AllowPrefix: true}.Default(),

+		DNSBindAddr:      flagtypes.Addr{Value: "0.0.0.0:8053", DefaultScheme: "tcp", DefaultPort: 8053, AllowPrefix: true}.Default(),

 		ConfigDir: &util.StringFlag{},

@@ -209,6 +209,8 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 		DNSConfig: &configapi.DNSConfig{

 			BindAddress: dnsServingInfo.BindAddress,

 			BindNetwork: dnsServingInfo.BindNetwork,

+

+			AllowRecursiveQueries: true,

 		},

 		MasterClients: configapi.MasterClients{

@@ -538,7 +540,7 @@ func (args MasterArgs) GetDNSBindAddress() (flagtypes.Addr, error) {

 	if args.DNSBindAddr.Provided {

 		return args.DNSBindAddr, nil

 	}

-	dnsAddr := flagtypes.Addr{Value: args.ListenArg.ListenAddr.Host, DefaultPort: 53}.Default()

+	dnsAddr := flagtypes.Addr{Value: args.ListenArg.ListenAddr.Host, DefaultPort: args.DNSBindAddr.DefaultPort}.Default()

 	return dnsAddr, nil

 }

@@ -206,13 +206,6 @@ func (o *AllInOneOptions) Complete() error {

 	o.NodeArgs.NodeName = strings.ToLower(o.NodeArgs.NodeName)

 	o.NodeArgs.MasterCertDir = o.MasterOptions.MasterArgs.ConfigDir.Value()

-	// in the all-in-one, default ClusterDNS to the master's address

-	if host, _, err := net.SplitHostPort(masterAddr.Host); err == nil {

-		if ip := net.ParseIP(host); ip != nil {

-			o.NodeArgs.ClusterDNS = ip

-		}

-	}

-

 	return nil

 }

@@ -227,7 +227,7 @@ func TestDNS(t *testing.T) {

 		},

 		{

 			dnsQuestionName:   "www.google.com.",

-			recursionExpected: false,

+			recursionExpected: true,

 		},

 	}

 	for i, tc := range tests {

@@ -236,7 +236,7 @@ func TestDNS(t *testing.T) {

 			qType = dns.TypeSRV

 		}

 		m1 := &dns.Msg{

-			MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: false},

+			MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: tc.recursionExpected},

 			Question: []dns.Question{{tc.dnsQuestionName, qType, dns.ClassINET}},

 		}

 		ch := make(chan struct{})