diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs
index 16dc4023ce..aac202b97c 100644
--- a/pageserver/src/page_service.rs
+++ b/pageserver/src/page_service.rs
@@ -697,7 +697,8 @@ impl Connection {
 
             // branch_create <branchname> <startpoint>
             // TODO lazy static
-            let re = Regex::new(r"^branch_create (\w+) ([\w@\\]+)[\r\n\s]*;?$").unwrap();
+            // TOOD: escaping, to allow branch names with spaces
+            let re = Regex::new(r"^branch_create (\S+) (\S+)[\r\n\s]*;?$").unwrap();
             let caps = re.captures(&query_str).ok_or_else(err)?;
 
             let branchname: String = String::from(caps.get(1).ok_or_else(err)?.as_str());
diff --git a/vendor/postgres b/vendor/postgres
index 2a6c17f1e0..40465243d6 160000
--- a/vendor/postgres
+++ b/vendor/postgres
@@ -1 +1 @@
-Subproject commit 2a6c17f1e013ecb5a480ad3e9db24f6b2972b8b1
+Subproject commit 40465243d6441e8085071396102953a6bc5e060b