diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile
index 0679a99ba..84d3437cb 100644
--- a/net/aircrack-ng/Makefile
+++ b/net/aircrack-ng/Makefile
@@ -28,6 +28,7 @@ define Package/aircrack-ng
   DEPENDS:=+libpthread
   TITLE:=next generation of aircrack with new features
   URL:=http://www.aircrack-ng.org/
+  SUBMENU:=wireless
 endef
 
 define Package/aircrack-ng/description
diff --git a/net/aircrack-ptw/Makefile b/net/aircrack-ptw/Makefile
index 5f7d216ee..915717729 100644
--- a/net/aircrack-ptw/Makefile
+++ b/net/aircrack-ptw/Makefile
@@ -28,6 +28,7 @@ define Package/aircrack-ptw
   DEPENDS:=+libpcap
   TITLE:=A tool using a new method for breaking WEP Keys
   URL:=http://www.cdc.informatik.tu-darmstadt.de/aircrack-ptw/
+  SUBMENU:=wireless
 endef
 
 define Build/Configure
diff --git a/net/amwall/Makefile b/net/amwall/Makefile
index 48c35f5c1..9b2eb3545 100644
--- a/net/amwall/Makefile
+++ b/net/amwall/Makefile
@@ -28,6 +28,7 @@ define Package/amwall
   DEPENDS:=+libamsel
   TITLE:=PF to iptables
   URL:=http://www.amselinux.net/
+  SUBMENU:=firewall
 endef
 
 define Build/Compile
diff --git a/net/atftp/Makefile b/net/atftp/Makefile
index 2d503b882..2e8e6ab33 100644
--- a/net/atftp/Makefile
+++ b/net/atftp/Makefile
@@ -24,6 +24,7 @@ define Package/atftp/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=TFTP
+  SUBMENU:=FTP
 endef
 
 define Package/atftp
diff --git a/net/autossh/Makefile b/net/autossh/Makefile
index f8f47aa57..4a42308b3 100644
--- a/net/autossh/Makefile
+++ b/net/autossh/Makefile
@@ -26,6 +26,7 @@ define Package/autossh
   CATEGORY:=Network
   TITLE:=Autossh client
   URL:=http://www.harding.motd.ca/autossh/
+  SUBMENU:=ssh
 endef
 
 define Build/Compile
diff --git a/net/bind/Makefile b/net/bind/Makefile
index 7c49f9cf3..90d0e132b 100644
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -32,7 +32,7 @@ define Package/bind/Default
   DEPENDS:=+bind-libs
   TITLE:=bind
   URL:=http://www.isc.org/sw/bind/
-  SUBMENU:=ISC Bind
+  SUBMENU:=dns
 endef
 
 define Package/bind-libs
@@ -40,7 +40,7 @@ define Package/bind-libs
   CATEGORY:=Network
   TITLE:=bind shared libraries
   URL:=http://www.isc.org/sw/bind/
-  SUBMENU:=ISC Bind
+  SUBMENU:=dns
 endef
 
 define Package/bind-server
diff --git a/net/cups/Makefile b/net/cups/Makefile
index 0cc532107..1f495e5b3 100644
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -33,6 +33,7 @@ define Package/cups
   DEPENDS:=+zlib
   TITLE:=Common UNIX Printing System
   URL:=http://www.cups.org/
+  SUBMENU:=printing
 endef
 
 define Package/cups/description
diff --git a/net/gmediaserver/Makefile b/net/gmediaserver/Makefile
index a108bcf38..decabd383 100644
--- a/net/gmediaserver/Makefile
+++ b/net/gmediaserver/Makefile
@@ -24,6 +24,7 @@ define Package/gmediaserver
   DEPENDS:=+id3lib +libiconv +libmagic +file +libupnp +libuuid
   TITLE:=An UPnP music media server
   URL:=http://www.nongnu.org/gmediaserver/
+  SUBMENU:=multimedia
 endef
 
 define Package/gmediaserver/description
diff --git a/net/icecast/Makefile b/net/icecast/Makefile
index 72103b490..4b9e1c861 100644
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@@ -28,6 +28,7 @@ define Package/icecast
   DEPENDS:=+libcurl +libvorbisidec +libxml2 +libxslt
   TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
   URL:=http://www.icecast.org/
+  SUBMENU:=multimedia
 endef
 
 define Package/icecast/description
diff --git a/net/ipkungfu/Makefile b/net/ipkungfu/Makefile
index 96479c449..8f02b3822 100644
--- a/net/ipkungfu/Makefile
+++ b/net/ipkungfu/Makefile
@@ -27,6 +27,7 @@ define Package/ipkungfu
   CATEGORY:=Network
   TITLE:=IPKungFu is an iptables-based Linux firewall
   URL:=http://www.linuxkungfu.org/
+  SUBMENU:=firewall
 endef
 
 define Package/ipkungfu/description
diff --git a/net/iptables-snmp/Makefile b/net/iptables-snmp/Makefile
index 0cadb4d71..61791504a 100644
--- a/net/iptables-snmp/Makefile
+++ b/net/iptables-snmp/Makefile
@@ -28,6 +28,7 @@ define Package/iptables-snmp
   DEPENDS:=+snmpd
   TITLE:=An snmpd plugin to access iptables rules
   URL:=http://www.nobiscuit.com/iptables-snmp/
+  SUBMENU:=firewall
 endef
 
 define Package/iptables-snmp/description
diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index eb490e661..756f02d77 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -26,6 +26,7 @@ define Package/kismet/Default
   TITLE:=Kismet
   DEPENDS:= +uclibcxx
   URL:=http://www.kismetwireless.net/
+  SUBMENU:=wireless
 endef
 
 define Package/kismet/Default/description
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 168cfe0e1..a4f6616bf 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -28,6 +28,7 @@ define Package/maradns
   DEPENDS:=+libpthread
   TITLE:=Small and secure DNS Server
   URL:=http://www.maradns.org/
+  SUBMENU:=dns
 endef
 
 define Package/maradns/conffiles
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 56af28882..578f5efec 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -33,6 +33,7 @@ define Package/openssh-client
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH client
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-client/description
@@ -49,6 +50,7 @@ define Package/openssh-client-utils
   DEPENDS:=openssh-client
   TITLE:=OpenSSH client utilities
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-client-utils/description
@@ -61,6 +63,7 @@ define Package/openssh-server
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH server
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-server/description
@@ -77,6 +80,7 @@ define Package/openssh-sftp-client
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH SFTP client
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-sftp-client/description
@@ -89,6 +93,7 @@ define Package/openssh-sftp-server
   DEPENDS:=
   TITLE:=OpenSSH SFTP server
   URL:=http://www.openssh.com/
+  SUBMENU:=ssh
 endef
 
 define Package/openssh-sftp-server/description
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 84175950a..2149fcb48 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -28,6 +28,7 @@ define Package/openvpn
   DEPENDS:=+kmod-tun +libopenssl +liblzo
   TITLE:=Open source VPN solution using SSL
   URL:=http://openvpn.net
+  SUBMENU:=vpn
 endef
 
 define Package/openvpn/description
diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile
index 0de6a11d8..682fd8826 100644
--- a/net/p910nd/Makefile
+++ b/net/p910nd/Makefile
@@ -23,6 +23,7 @@ define Package/p910nd
   CATEGORY:=Network
   TITLE:=A small non-spooling printer server
   URL:=http://www.etherboot.org/p910nd/
+  SUBMENU:=printing
 endef
 
 define Package/p910nd/conffiles
diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index 1ca203796..60add2bdb 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -28,6 +28,7 @@ define Package/pptpd
   DEPENDS:=+kmod-ppp +kmod-gre
   TITLE:=PopTop pptp server
   URL:=http://www.poptop.org/
+  SUBMENU:=dial-in/up
 endef
 
 define Build/Configure
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index 3ffd02593..4e9f22750 100644
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -28,6 +28,7 @@ define Package/rp-l2tpd
   TITLE:=Roaring Penguin L2TP
   URL:=http://sourceforge.net/projects/rp-l2tp/
   TITLE+= daemon
+  SUBMENU:=dial-in/up
 endef
 
 define Package/rp-l2tpd/description
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index ab706b7ee..d3da4871f 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -28,8 +28,9 @@ define Package/rp-pppoe/Default
   DEPENDS:=+ppp
   TITLE:=PPPoE (PPP over Ethernet)
   URL:=http://roaringpenguin.com/penguin/pppoe/
+  SUBMENU:=dial-in/up
 endef
-  
+
 define Package/rp-pppoe-client
   $(call Package/rp-pppoe/Default)
   TITLE+= client
diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index 46a81cdbf..336f9ee12 100644
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -24,6 +24,7 @@ define Package/shorewall
   DEPENDS:=+iptables
   TITLE:=Shorewall firewall
   URL:=http://www.shorewall.net/
+  SUBMENU:=firewall
 endef
 
 define define Package/shorewall/description
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index de4c5d8f3..a4ac24dcc 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -30,6 +30,7 @@ define Package/tinc
   DEPENDS:=+liblzo +libopenssl +zlib
   TITLE:=VPN tunneling daemon
   URL:=http://www.tinc-vpn.org/
+  SUBMENU:=vpn
 endef
 
 define Build/Configure
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index 459baa310..6940c20e9 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -28,6 +28,7 @@ define Package/vpnc
   DEPENDS:=+libgpg-error +libgcrypt +kmod-tun +ip
   TITLE:=VPN client for Cisco 3000
   URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/
+  SUBMENU:=vpn
 endef
 
 define Package/vpnc/conffiles
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index e09251fa7..7015544f2 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -27,6 +27,7 @@ define Package/vtun
   DEPENDS:=+kmod-tun +liblzo +libopenssl +zlib
   TITLE:=VPN tunneling daemon
   URL:=http://vtun.sourceforge.net
+  SUBMENU:=vpn
 endef
 
 define Package/vtun/conffiles