--- /usr/local/pkg/ntopng.inc.orig	2016-11-28 14:15:00.000000000 +0100
+++ /usr/local/pkg/ntopng.inc	2016-12-09 22:46:37.000000000 +0100
@@ -168,6 +161,9 @@
 	/* Set up admin password */
 	ntopng_set_redis_password();
 	
+	/* Set up Google Maps API Key */
+	ntopng_set_googlemaps_apikey();
+	
 	/* (Re)start services if not booting */
 	if (!platform_booting()) {
 		ntopng_services_stop();
@@ -222,6 +218,21 @@
 	}
 }
 
+function ntopng_set_googlemaps_apikey() {
+	global $config, $ntopng_config, $redis_path;
+	$ntopng_config = $config['installedpackages']['ntopng']['config'][0];
+
+	if (!empty($ntopng_config['googlemaps_api_key'])) {
+		$apikey = $ntopng_config['googlemaps_api_key'];
+		if (ntopng_redis_started()) {
+			mwexec("{$redis_path}/redis-cli SET ntopng.prefs.google_apis_browser_key " . escapeshellarg($apikey));
+			mwexec("{$redis_path}/redis-cli save");
+		} else {
+			log_error(gettext("[ntopng] Cannot set Google Maps API Key - redis-server is not running."));
+		}
+	}
+}
+
 function ntopng_create_datadir() {
 	safe_mkdir("/var/db/ntopng/rrd/graphics", 0755);
 	mwexec("/bin/chmod -R 755 /var/db/ntopng");
--- /usr/local/pkg/ntopng.xml.orig	2016-11-28 14:15:00.000000000 +0100
+++ /usr/local/pkg/ntopng.xml	2016-12-09 22:46:25.000000000 +0100
@@ -162,7 +149,7 @@
 				The historical interface is considered <a href="http://www.gossamer-threads.com/lists/ntop/misc/37506#37506">abandoned by upstream</a>,
 				pending more usable replacement.<br /><br />
 				<input type="submit" name="Delete" value="Delete (Historical) Data" />
-				<strong><span class="errmsg">WARNING:</span> This will delete all ntopng graphs, traffic data and historical dump flows!
+				<strong><span class="errmsg">WARNING:</span> This will delete all ntopng graphs, traffic data and historical dump flows!</strong>
 				]]>
 			</sethelp>
 			<type>checkbox</type>
@@ -173,6 +160,19 @@
 			<description>Disables all alerts generated by ntopng, such as flooding notifications.</description>
 			<type>checkbox</type>
 		</field>
+		<field>
+			<fielddescr>Google Maps API Key</fielddescr>
+			<fieldname>googlemaps_api_key</fieldname>
+			<description>
+				<![CDATA[
+				Graphical hosts geomaps are based on Google Maps APIs. Google requires an API key to be sumbitted for every request.<br />
+				Detailed information on how to obtain an API key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key">can be found here</a>.<br />
+				Once obtained, the API key can be placed in this field.
+				]]>
+			</description>
+			<type>input</type>
+			<size>40</size>
+		</field>
 	</fields>
 	<custom_php_resync_config_command>
 		ntopng_sync_package();