diff --git a/voice-client/files/etc/asterisk_templates/sip.conf.TEMPLATE b/voice-client/files/etc/asterisk_templates/sip.conf.TEMPLATE
index 27ac53c31dd022ac54e8ee0613d7615857799751..8c6632fe6febb92defe8eee67ec20b97da406227 100644
--- a/voice-client/files/etc/asterisk_templates/sip.conf.TEMPLATE
+++ b/voice-client/files/etc/asterisk_templates/sip.conf.TEMPLATE
@@ -4,7 +4,7 @@ allowoverlap=yes
 allowtransfer=yes
 bindaddr=0.0.0.0
 srvlookup=|SRVLOOKUP|
-maxexpiry=600
+maxexpiry=|MAXEXPIRY|
 minexpiry=|MINEXPIRY|
 qualifyfreq=55
 alwaysauthreject=yes
diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client
index 9601f28e6e67f20ed2903ef02a79e2b4684293e9..3e3fab088603eb73e991cb67ea62db4fc82d9626 100755
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -348,6 +348,7 @@ configure_sip()
 	local blindxfer
 	local minexpiry
 	local defaultexpiry
+	local maxexpiry
 	local registertimeout
 	local registerattempts
 	local registertimeoutbackoff
@@ -379,6 +380,7 @@ configure_sip()
 	config_get blindxfer $1 blindxfer
 	config_get minexpiry $1 minexpiry
 	config_get defaultexpiry $1 defaultexpiry
+	config_get maxexpiry $1 maxexpiry
 	config_get registertimeout $1 registertimeout
 	config_get registerattempts $1 registerattempts
 	config_get registertimeoutbackoff $1 registertimeoutbackoff
@@ -438,6 +440,12 @@ configure_sip()
 		sed -i "s/|DEFAULTEXPIRY|/$defaultexpiry/g"			$WORKDIR/sip.tmp
 	fi
 
+	if [ -z "$maxexpiry" ] ; then
+		sed -i "s/|MAXEXPIRY|/600/g"		$WORKDIR/sip.tmp
+	else
+		sed -i "s/|MAXEXPIRY|/$maxexpiry/g"	$WORKDIR/sip.tmp
+	fi
+
 	if [ -z "$registertimeout" ] ; then
 		sed -i "s/registertimeout=|REGISTERTIMEOUT|/;registertimeout=/g"	$WORKDIR/sip.tmp
 	else