diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 09b983d17..54114da33 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -764,119 +764,119 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admission/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "158a70956558e7d70e2d3276858a3f9373b46bfc"
+			"Rev": "57d7f151236665c12202a51c21bc939eb5d5ba91"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
diff --git a/pkg/util/logs/logs.go b/pkg/util/logs/logs.go
index 392bbc0fb..a3909583a 100644
--- a/pkg/util/logs/logs.go
+++ b/pkg/util/logs/logs.go
@@ -46,8 +46,8 @@ func (writer GlogWriter) Write(data []byte) (n int, err error) {
 func InitLogs() {
 	log.SetOutput(GlogWriter{})
 	log.SetFlags(0)
-	// The default glog flush interval is 30 seconds, which is frighteningly long.
-	go wait.Until(glog.Flush, *logFlushFreq, wait.NeverStop)
+	// The default glog flush interval is 5 seconds.
+	go wait.Forever(glog.Flush, *logFlushFreq)
 }
 
 // FlushLogs flushes logs immediately.