diff --git a/server/app/scripts/controllers/repo.js b/server/app/scripts/controllers/repo.js
index d585600b7..885f4d40e 100644
--- a/server/app/scripts/controllers/repo.js
+++ b/server/app/scripts/controllers/repo.js
@@ -33,7 +33,7 @@ angular.module('app').controller("RepoController", function($scope, $http, $rout
 			$scope.state = 1;
 		});
 
-	//$http({method: 'GET', url: '/v1/repos/'+repo.host+'/'+repo.owner+"/"+repo.name+"/feed"}).
+	//$http({method: 'GET', url: '/api/repos/'+repo.host+'/'+repo.owner+"/"+repo.name+"/feed"}).
 	//	success(function(data, status, headers, config) {
 	//		$scope.commits = (typeof data==='string')?[]:data;
 	//	}).
diff --git a/server/app/scripts/filters/filters.js b/server/app/scripts/filters/filters.js
index a38592f69..bdb4ec0bf 100644
--- a/server/app/scripts/filters/filters.js
+++ b/server/app/scripts/filters/filters.js
@@ -98,7 +98,7 @@
       var scheme = window.location.protocol;
       var host = window.location.host;
       var path = repo.host+'/'+repo.owner+'/'+repo.name;
-      return '[![Build Status]('+scheme+'//'+host+'/v1/badge/'+path+'/status.svg?branch=master)]('+scheme+'//'+host+'/'+path+')'
+      return '[![Build Status]('+scheme+'//'+host+'/api/badge/'+path+'/status.svg?branch=master)]('+scheme+'//'+host+'/'+path+')'
     }
   }
 
@@ -112,7 +112,7 @@
       var scheme = window.location.protocol;
       var host = window.location.host;
       var path = repo.host+'/'+repo.owner+'/'+repo.name;
-      return '[![Build Status]('+scheme+'//'+host+'/v1/badge/'+path+'/status.svg?branch=master)]('+scheme+'//'+host+'/'+path+')'
+      return '[![Build Status]('+scheme+'//'+host+'/api/badge/'+path+'/status.svg?branch=master)]('+scheme+'//'+host+'/'+path+')'
     }
   }
 
diff --git a/server/app/views/repo_edit.html b/server/app/views/repo_edit.html
index b6e0a48c5..6edec9c16 100644
--- a/server/app/views/repo_edit.html
+++ b/server/app/views/repo_edit.html
@@ -61,7 +61,7 @@
 		<div class="pure-g">
 			<div class="pure-u-1">
 				<a ng-href="/{{ repo | fullPath }}" target="_blank" style="float:right;">
-					<img ng-src="/v1/badge/{{ repo | fullPath }}/status.svg" />
+					<img ng-src="/api/badge/{{ repo | fullPath }}/status.svg" />
 				</a>
 				<h2>Status Badge</h2>
 			</div>
diff --git a/server/handler/repo.go b/server/handler/repo.go
index b8cef9a64..1fb9ab274 100644
--- a/server/handler/repo.go
+++ b/server/handler/repo.go
@@ -98,7 +98,7 @@ func PostRepo(c web.C, w http.ResponseWriter, r *http.Request) {
 
 	// setup the post-commit hook with the remote system and
 	// if necessary, register the public key
-	var hook = fmt.Sprintf("%s/v1/hook/%s", httputil.GetURL(r), repo.Remote)
+	var hook = fmt.Sprintf("%s/api/hook/%s", httputil.GetURL(r), repo.Remote)
 	if err := remote.Activate(user, repo, hook); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		return