diff --git a/server/tinode.conf b/server/tinode.conf
index 1150260be9a2b2506d919043af612db0b306d2b3..0a387b40e60a07127ee5091fca704efbfbdcdc2e 100644
--- a/server/tinode.conf
+++ b/server/tinode.conf
@@ -85,6 +85,8 @@
 				// File system location to store uploaded files. In case of a cluster it
 				// must be accessible by all cluster members, i.e. a network drive like https://www.samba.org/
 				"upload_dir": "uploads",
+				// Cache-Control header to use for uploaded files. 86400 seconds = 24 hours.
+				"cache_control": "max-age=86400",
 				// Origin URLs allowed to download/upload files, e.g. ["https://www.example.com", "http://example.com"].
 				// Not necessary in most cases.
 				// "cors_origins": ["*"]
@@ -111,6 +113,10 @@
 				// that overrides the default generated endpoint for a client. Set this
 				// to `""` to use the default generated endpoint.
 				"endpoint": "",
+				// Expiration time for presigned URLs in seconds.
+				"presign_ttl": 3600,
+				// Cache-Control header to use for uploaded files. 86400 seconds = 24 hours.
+				"cache_control": "max-age=86400",
 				// Origin URLs allowed to download files, e.g. ["https://www.example.com", "http://example.com"].
 				// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
 				"cors_origins": ["*"]
@@ -411,7 +417,7 @@
 				//
 				// === IMPORTANT ===
 				//
-				// REMOVE IT IN PRODUCTION!!! Otherwise anyone will be able to register
+				// REMOVE IN PRODUCTION!!! Otherwise anyone will be able to register
 				// with fake emails.
 				"debug_response": "123456"
 			}
@@ -445,7 +451,7 @@
 				//
 				// === IMPORTANT ===
 				//
-				// REMOVE IT IN PRODUCTION!!! Otherwise anyone will be able to register
+				// REMOVE IN PRODUCTION!!! Otherwise anyone will be able to register
 				// with fake phone numbers.
 				"debug_response": "123456"
 			}
@@ -594,6 +600,19 @@
 		],
 		// An alternative way to provide STUN/TURN configuration.
 		"ice_servers_file": "/path/to/ice-servers-config.json",
+
+		// Video conferencing configuration.
+		"vc": {
+			"enabled": true,
+			// Media server endpoint url.
+			"endpoint_url": "ws://localhost:7880/",
+			// Media server API key.
+			"api_key": "devkey",
+			// Media server secret.
+			"api_secret": "secret",
+			// Maximum call duration in seconds (1800 seconds = 30 min).
+			"max_duration": 1800
+		}
 	},
 
 	// Cluster-mode configuration.