3 files changed, 21 insertions, 19 deletions
diff --git a/interface-definitions/include/nat-address-port.xml.i b/interface-definitions/include/nat-address.xml.i
index 8705d31cb..933dae07b 100644
--- a/interface-definitions/include/nat-address-port.xml.i
+++ b/interface-definitions/include/nat-address.xml.i
@@ -35,20 +35,3 @@
     </constraint>
   </properties>
 </leafNode>
-<leafNode name="port">
-  <properties>
-    <help>Port number</help>
-    <valueHelp>
-      <format>1-65535</format>
-      <description>Numeric IP port</description>
-    </valueHelp>
-    <valueHelp>
-      <format>start-end</format>
-      <description>Numbered port range (e.g., 1001-1005)</description>
-    </valueHelp>
-    <valueHelp>
-      <format> </format>
-      <description>\n\nMultiple destination ports can be specified as a comma-separated list.\nThe whole list can also be negated using '!'.\nFor example: '!22,telnet,http,123,1001-1005'</description>
-    </valueHelp>
-  </properties>
-</leafNode>
diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i
new file mode 100644
index 000000000..24803ae05
--- /dev/null
+++ b/interface-definitions/include/nat-port.xml.i
@@ -0,0 +1,17 @@
+<leafNode name="port">
+  <properties>
+    <help>Port number</help>
+    <valueHelp>
+      <format>1-65535</format>
+      <description>Numeric IP port</description>
+    </valueHelp>
+    <valueHelp>
+      <format>start-end</format>
+      <description>Numbered port range (e.g., 1001-1005)</description>
+    </valueHelp>
+    <valueHelp>
+      <format> </format>
+      <description>\n\nMultiple destination ports can be specified as a comma-separated list.\nThe whole list can also be negated using '!'.\nFor example: '!22,telnet,http,123,1001-1005'</description>
+    </valueHelp>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index fdba4b8bd..183692664 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -21,7 +21,8 @@
         <help>NAT destination parameters</help>
       </properties>
       <children>
-        #include <include/nat-address-port.xml.i>
+        #include <include/nat-address.xml.i>
+        #include <include/nat-port.xml.i>
       </children>
     </node>
     <leafNode name="disable">
@@ -79,7 +80,8 @@
         <help>NAT source parameters</help>
       </properties>
       <children>
-        #include <include/nat-address-port.xml.i>
+        #include <include/nat-address.xml.i>
+        #include <include/nat-port.xml.i>
       </children>
     </node>
   </children>