diff --git a/pkg/serverconfig/genconfig.go b/pkg/serverconfig/genconfig.go
index 4712e94e9..132c3c399 100644
--- a/pkg/serverconfig/genconfig.go
+++ b/pkg/serverconfig/genconfig.go
@@ -238,8 +238,8 @@ func GenLowLevelConfig(conf *Config) (lowLevelConf *Config, err error) {
 		secretRing = conf.RequiredString("identitySecretRing")
 		blobPath   = conf.RequiredString("blobPath")
 		tlsOn      = conf.OptionalBool("TLS", false)
-		tlsCert    = conf.OptionalString("TLSCert", "")
-		tlsKey     = conf.OptionalString("TLSKey", "")
+		tlsCert    = conf.OptionalString("TLSCertFile", "")
+		tlsKey     = conf.OptionalString("TLSKeyFile", "")
 		dbname     = conf.OptionalString("dbname", "")
 		mysql      = conf.OptionalString("mysql", "")
 		mongo      = conf.OptionalString("mongo", "")
diff --git a/pkg/serverconfig/testdata/tls.json b/pkg/serverconfig/testdata/tls.json
index 8fece7898..ee15924b7 100644
--- a/pkg/serverconfig/testdata/tls.json
+++ b/pkg/serverconfig/testdata/tls.json
@@ -1,8 +1,8 @@
 {
 	"listen": "1.2.3.4:443",
 	"TLS": true,
-	"TLSCert": "/tls.crt",
-        "TLSKey": "/tls.key",
+	"TLSCertFile": "/tls.crt",
+	"TLSKeyFile": "/tls.key",
 	"auth": "userpass:camlistore:pass3179",
 	"blobPath": "/tmp/blobs",
 	"identity": "26F5ABDA",