diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 537697af71..37c068ccab 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -28,7 +28,7 @@
 		},
 		{
 			"ImportPath": "github.com/endophage/go-tuf",
-			"Rev": "ab9152fd5c06cac77b744c45accd0c5accc09e19"
+			"Rev": "73f8528774f93cfe707851ab2ff7503a8756ff4b"
 		},
 		{
 			"ImportPath": "github.com/golang/protobuf/proto",
diff --git a/Godeps/_workspace/src/github.com/endophage/go-tuf/repo.go b/Godeps/_workspace/src/github.com/endophage/go-tuf/repo.go
index b7a96bbebd..341712ee65 100644
--- a/Godeps/_workspace/src/github.com/endophage/go-tuf/repo.go
+++ b/Godeps/_workspace/src/github.com/endophage/go-tuf/repo.go
@@ -80,6 +80,22 @@ func (r *Repo) Init(consistentSnapshot bool) error {
 	if err != nil {
 		return err
 	}
+	_, err = r.GenKey("root")
+	if err != nil {
+		return err
+	}
+	_, err = r.GenKey("targets")
+	if err != nil {
+		return err
+	}
+	_, err = r.GenKey("snapshot")
+	if err != nil {
+		return err
+	}
+	_, err = r.GenKey("timestamp")
+	if err != nil {
+		return err
+	}
 	t.Expires = data.DefaultExpires("targets").Round(time.Second)
 	t.Version++
 	err = r.setMeta("targets.json", t)
diff --git a/server/handlers/default.go b/server/handlers/default.go
index 6d29fcca95..c05f07b6df 100644
--- a/server/handlers/default.go
+++ b/server/handlers/default.go
@@ -191,22 +191,6 @@ func GenKeysHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *
 			Err:        err,
 		}
 	}
-	_, err = tufRepo.GenKey("root")
-	if err != nil {
-		log.Println(err)
-	}
-	_, err = tufRepo.GenKey("targets")
-	if err != nil {
-		log.Println(err)
-	}
-	_, err = tufRepo.GenKey("snapshot")
-	if err != nil {
-		log.Println(err)
-	}
-	_, err = tufRepo.GenKey("timestamp")
-	if err != nil {
-		log.Println(err)
-	}
 	_ = tufRepo.Init(false)
 	return nil
 }