diff --git a/kbfsblock/bserver_constants.go b/kbfsblock/bserver_constants.go
index <HASH>..<HASH> 100644
--- a/kbfsblock/bserver_constants.go
+++ b/kbfsblock/bserver_constants.go
@@ -8,5 +8,5 @@ const (
 	// ServerTokenServer is the expected server type for bserver authentication.
 	ServerTokenServer = "kbfs_block"
 	// ServerTokenExpireIn is the TTL to use when constructing an authentication token.
-	ServerTokenExpireIn = 2 * 60 * 60 // 2 hours
+	ServerTokenExpireIn = 24 * 60 * 60 // 24 hours
 )
diff --git a/kbfsmd/server_constants.go b/kbfsmd/server_constants.go
index <HASH>..<HASH> 100644
--- a/kbfsmd/server_constants.go
+++ b/kbfsmd/server_constants.go
@@ -8,5 +8,5 @@ const (
 	// ServerTokenServer is the expected server type for mdserver authentication.
 	ServerTokenServer = "kbfs_md"
 	// ServerTokenExpireIn is the TTL to use when constructing an authentication token.
-	ServerTokenExpireIn = 2 * 60 * 60 // 2 hours
+	ServerTokenExpireIn = 24 * 60 * 60 // 24 hours
 )
kbfsmd/kbfsblock: Increase bserver and mdserver token expiry times. Needs to be deployed before any clients start sending such expire times.