Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 13359)
+++ tools/gformat.py	(revision 13398)
@@ -772,6 +772,14 @@
   externalif="{{ externalif|default('vr0', true) }}"
   masterip="{{ masterip }}"
+
+  {% if gateway and service_proxy_ileiden %}
+  defaultrouter="{{ gateway }}"
+  {% else %}
+  #defaultrouter="NOTSET"
+  {% endif %}
   
+  #
   # Defined services 
+  #
   service_proxy_ileiden="{{ service_proxy_ileiden|yesorno }}"
   service_proxy_normal="{{ service_proxy_normal|yesorno }}"
@@ -779,5 +787,4 @@
   service_incoming_rdr="{{ service_incoming_rdr|yesorno }}"
   service_concentrator="{{ service_concentrator|yesorno }}"
-  #
 
   {% if service_proxy_ileiden %}