diff --git a/modules/module_list b/modules/module_list
index e0eddf9..68c5107 100644
--- a/modules/module_list
+++ b/modules/module_list
@@ -15,3 +15,6 @@ script2http Post script output via HTTP
 sshfs Mounts remote File Systems over SSH
 uptime System Uptime
 urlsnarf Sniffs HTTP URL traffic
+clomac Clone Clients MAC address into WAN interface
+upnp-portfwd uPnP Port Forwarding
+ddnsc Dynamic Domain Name Service
diff --git a/modules/upnp-portfwd b/modules/upnp-portfwd
index 47bd4fa..c322ab9 100644
--- a/modules/upnp-portfwd
+++ b/modules/upnp-portfwd
@@ -87,6 +87,7 @@ function start {
 	        uci commit upnp_portfwd
 	fi
 	if [ ! -e "/usr/bin/upnpc" ]; then
+		opkg update
 		opkg install miniupnpc
 	fi
 
@@ -119,7 +120,7 @@ function stop {
 }
 
 function status {
-	if [ "$(uci get upnp_portfwd.enabled)" == "1" ]; then
+	if [ "$(uci get upnp_portfwd.enabled 2>/dev/null)" == "1" ]; then
 		echo "1"
 	else
 		echo "0"