diff --git a/net/upnp/Makefile b/net/upnp/Makefile
index ad55189cf..44cfe30a3 100644
--- a/net/upnp/Makefile
+++ b/net/upnp/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		upnp
-PLUGIN_VERSION=		1.5
-PLUGIN_REVISION=	6
+PLUGIN_VERSION=		1.6
 PLUGIN_DEPENDS=		miniupnpd
 PLUGIN_COMMENT=		Universal Plug and Play (UPnP IGD & PCP/NAT-PMP) Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
index 54a44a6c6..3fdf21214 100644
--- a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
+++ b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
@@ -232,7 +232,7 @@ function miniupnpd_configure_do($verbose = false)
 
             /* Allow UPnP IGD or PCP/NAT-PMP as requested */
             $config_text .= "enable_upnp="   . ( $upnp_config['enable_upnp']   ? "yes\n" : "no\n" );
-            $config_text .= "enable_natpmp=" . ( $upnp_config['enable_natpmp'] ? "yes\n" : "no\n" );
+            $config_text .= "enable_pcp_pmp=" . ( $upnp_config['enable_natpmp'] ? "yes\n" : "no\n" );
 
             /* configure lifetimes to force periodic expire */
             $config_text .= "clean_ruleset_interval=600\n";
diff --git a/net/upnp/src/www/services_upnp.php b/net/upnp/src/www/services_upnp.php
index 077c3bae7..e56e08a43 100644
--- a/net/upnp/src/www/services_upnp.php
+++ b/net/upnp/src/www/services_upnp.php
@@ -221,9 +221,12 @@ include("head.inc");
                   </thead>
                   <tbody>
                     <tr>
-                      <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Enable");?></td>
+                      <td><a id="help_for_enable" href="#" class="showhelp"><i class="fa fa-info-circle text-muted"></i></a> <?=gettext("Enable");?></td>
                       <td>
                        <input name="enable" type="checkbox" value="yes" <?=!empty($pconfig['enable']) ? "checked=\"checked\"" : ""; ?> />
+                       <div class="hidden" data-for="help_for_enable">
+                         <?=gettext("Enable autonomous port mapping service.");?>
+                       </div>
                       </td>
                     </tr>
                     <tr>
diff --git a/net/upnp/src/www/status_upnp.php b/net/upnp/src/www/status_upnp.php
index d0c5d4fcd..0a9a983d8 100644
--- a/net/upnp/src/www/status_upnp.php
+++ b/net/upnp/src/www/status_upnp.php
@@ -62,41 +62,42 @@ include("head.inc");
 <?php
           else: ?>
           <div class="table-responsive">
-            <table class="table table-striped">
+            <table class="table table-striped table-condensed table-hover">
               <thead>
                 <tr>
-                  <td><?=gettext("Port");?></td>
-                  <td><?=gettext("Protocol");?></td>
-                  <td><?=gettext("Internal IP");?></td>
-                  <td><?=gettext("Int. Port");?></td>
-                  <td><?=gettext("Description");?></td>
+                  <td><?=gettext("Interface")?></td>
+                  <td><?=gettext("Ext. Port")?></td>
+                  <td><?=gettext("Internal IP")?></td>
+                  <td><?=gettext("Int. Port")?></td>
+                  <td><?=gettext("Protocol")?></td>
+                  <td><?=gettext("Source IP")?></td>
+                  <td><?=gettext("Source Port")?></td>
+                  <td><?=gettext("Description")?></td>
                 </tr>
               </thead>
               <tbody>
 <?php
               foreach ($rdr_entries as $rdr_entry):
-                  if (!preg_match("/on (.*) inet proto (.*) from (.*) to (.*) port = (.*) keep state label \"(.*)\" rtable [0-9] -> (.*) port (.*)/", $rdr_entry, $matches)) {
+                  if (!preg_match("/on (?P<iface>.*) inet proto (?P<proto>.*) from (?P<srcaddr>.*) (port (?P<srcport>.*) )?to (?P<extaddr>.*) port = (?P<extport>.*) keep state (label \"(?P<descr>.*)\" )?rtable [0-9] -> (?P<intaddr>.*) port (?P<intport>.*)/", $rdr_entry, $matches)) {
                       continue;
                   }
-                  $rdr_proto = $matches[2];
-                  $rdr_port = $matches[5];
-                  $rdr_label =$matches[6];
-                  $rdr_ip = $matches[7];
-                  $rdr_iport = $matches[8];
               ?>
                 <tr>
-                  <td><?=$rdr_port;?></td>
-                  <td><?=$rdr_proto;?></td>
-                  <td><?=$rdr_ip;?></td>
-                  <td><?=$rdr_iport;?></td>
-                  <td><?=$rdr_label;?></td>
+                  <td><?= html_safe(convert_friendly_interface_to_friendly_descr(convert_real_interface_to_friendly_interface_name($matches['iface']))) ?></td>
+                  <td><?= html_safe($matches['extport']) ?></td>
+                  <td><?= html_safe($matches['intaddr']) ?></td>
+                  <td><?= html_safe($matches['intport']) ?></td>
+                  <td><?= html_safe(strtoupper($matches['proto'])) ?></td>
+                  <td><?= html_safe($matches['srcaddr']) ?></td>
+                  <td><?= html_safe($matches['srcport'] ?: "any") ?></td>
+                  <td><?= html_safe($matches['descr']) ?></td>
                 </tr>
 <?php
               endforeach;?>
               </tbody>
               <tfoot>
                   <tr>
-                    <td colspan="5">
+                    <td colspan="8">
                       <form method="post">
                         <button type="submit" name="clear" id="clear" class="btn btn-primary" value="Clear"><?=gettext("Clear");?></button>
                         <?=gettext("all currently connected sessions");?>.