Index: /freepbx/branches/2.7/amp_conf/bin/generate_hints.php
===================================================================
--- /freepbx/branches/2.7/amp_conf/bin/generate_hints.php (revision 8599)
+++ /freepbx/branches/2.7/amp_conf/bin/generate_hints.php (revision 8849)
@@ -17,5 +17,11 @@
 
 	$astman         = new AGI_AsteriskManager();
-	if (! $res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
+
+  $astmanagerhost = (isset($amp_conf['ASTMANAGERHOST']) && trim($amp_conf['ASTMANAGERHOST']) != '')?$amp_conf['ASTMANAGERHOST']:'127.0.0.1';
+  if (isset($amp_conf['ASTMANAGERPORT']) && trim($amp_conf['ASTMANAGERPORT']) != '') {
+    $astmanagerhost .= ':'.$amp_conf['ASTMANAGERPORT'];
+  }
+
+	if (! $res = $astman->connect($astmanagerhost, $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {
 		exit;
 	}