diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index c6b9acf8ca..07924cd7c3 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -3710,6 +3710,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
 					strncpy(e->mailbox, mailbox, sizeof(e->mailbox) - 1);
 					snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08x", rand());
 					e->msgstate = -1;
+					e->amaflags = amaflags;
 					e->capability = capability;
 					e->parent = gw;
 					e->dtmfmode = dtmfmode;
@@ -3812,6 +3813,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v)
 						e->msgstate = -1;
 						e->parent = gw;
 					}
+					e->amaflags = amaflags;
 					e->capability = capability;
 					e->dtmfmode = dtmfmode;
 					e->adsi = adsi;
diff --git a/configs/mgcp.conf.sample b/configs/mgcp.conf.sample
index 63e7255576..f9ffc01d86 100755
--- a/configs/mgcp.conf.sample
+++ b/configs/mgcp.conf.sample
@@ -51,22 +51,24 @@
 
 ; known to work with wave7optics FTTH LMGs
 ;[192.168.1.20]
-;context=local
-;host=192.168.1.20
-;nat=no
-;wcardep=aaln/*		; enables wildcard endpoint and sets it to 'aaln/*' another common format is '*'
-;callerid = "Duane Cox" <123>
-;callwaiting=no
-;transfer=no
-;cancallforward=no
-;canreinvite=no
-;dtmfmode=inband
-;singlepath=yes		; This device only supports a single RTP path
-;line => aaln/1
-;callerid = "Duane Cox" <456>
-;callwaiting=no
-;transfer=no
-;cancallforward=no
-;canreinvite=no
-;dtmfmode=inband
-;line => aaln/2
+;accountcode	= 1000		; record this in cdr as account identification for billing
+;amaflags	= billing	; record this in cdr as flagged for 'billing', 'documentation', or 'omit'
+;context	= local
+;host		= 192.168.1.20
+;wcardep	= aaln/*	; enables wildcard endpoint and sets it to 'aaln/*' another common format is '*'
+;callerid 	= "Duane Cox" <123>	; now lets setup line 1 using per endpoint configuration...
+;callwaiting	= no
+;callreturn	= yes
+;cancallforward = yes
+;canreinvite	= no
+;transfer	= no
+;dtmfmode	= inband
+;line => aaln/1			; now lets save this config to line1 aka aaln/1
+;callerid 	= "Duane Cox" <456>	; now lets setup line 2
+;callwaiting	= no
+;callreturn	= yes
+;cancallforward = yes
+;canreinvite	= no
+;transfer	= no
+;dtmfmode	= inband
+;line => aaln/2			; now lets save this config to line2 aka aaln/2