diff --git a/debian/aptly.conf b/debian/aptly.conf
index a2c7cf24..93177314 100644
--- a/debian/aptly.conf
+++ b/debian/aptly.conf
@@ -285,6 +285,10 @@ gcs_publish_endpoints:
     #     # Project (optional)
     #     # Quota project used for GCS requests
     #     project: ""
+    #     # Endpoint (optional)
+    #     # Override the GCS endpoint (e.g. for staging or a fake server);
+    #     # leave empty to use the default GCS endpoint
+    #     endpoint: ""
     #     # Default ACLs (optional)
     #     # assign ACL to published files:
     #     # * private     (default)
diff --git a/system/t02_config/CreateConfigTest_gold b/system/t02_config/CreateConfigTest_gold
index a2c7cf24..93177314 100644
--- a/system/t02_config/CreateConfigTest_gold
+++ b/system/t02_config/CreateConfigTest_gold
@@ -285,6 +285,10 @@ gcs_publish_endpoints:
     #     # Project (optional)
     #     # Quota project used for GCS requests
     #     project: ""
+    #     # Endpoint (optional)
+    #     # Override the GCS endpoint (e.g. for staging or a fake server);
+    #     # leave empty to use the default GCS endpoint
+    #     endpoint: ""
     #     # Default ACLs (optional)
     #     # assign ACL to published files:
     #     # * private     (default)
diff --git a/utils/config_test.go b/utils/config_test.go
index 16ce23d7..2e5b0045 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -142,6 +142,7 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 		"      \"credentialsFile\": \"\",\n" +
 		"      \"serviceAccountJSON\": \"\",\n" +
 		"      \"project\": \"\",\n" +
+		"      \"endpoint\": \"\",\n" +
 		"      \"acl\": \"\",\n" +
 		"      \"storageClass\": \"\",\n" +
 		"      \"encryptionKey\": \"\",\n" +
@@ -377,6 +378,7 @@ gcs_publish_endpoints:
         credentials_file: /tmp/creds.json
         service_account_json: '{"type":"service_account"}'
         project: test-project
+        endpoint: ""
         acl: public-read
         storage_class: STANDARD
         encryption_key: "12345678901234567890123456789012"