From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 5 Nov 2005 02:16:36 +0000 (+0000)
Subject: reorganize/rationalize/format package menuconfig,
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/445d5e12cf785fd0741298de731fe801d46a8417

reorganize/rationalize/format package menuconfig,
make updatedd modular

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2333 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/6tunnel/Config.in b/openwrt/package/6tunnel/Config.in
index d5c0cdb02..614498b64 100644
--- a/openwrt/package/6tunnel/Config.in
+++ b/openwrt/package/6tunnel/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_6TUNNEL
-	tristate "6tunnel - IPv4 / IPv6 tunnel proxy"
+	prompt "6tunnel........................... IPv4 / IPv6 tunnel proxy"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_IPV6
 	help
@@ -8,5 +9,4 @@ config BR2_PACKAGE_6TUNNEL
 	  or IPv6 addresses and forward all data to IPv4 or IPv6 (default) host.
 	  
 	  http://toxygen.net/6tunnel/
-	  
 
diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 3f4b994c1..5fc3d9e1e 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -15,6 +15,7 @@ comment "Applications"
 source "package/deco/Config.in"
 source "package/gpsd/Config.in"
 source "package/haserl/Config.in"
+source "package/irssi/Config.in"
 source "package/lcd4linux/Config.in"
 source "package/less/Config.in"
 source "package/lua/Config.in"
@@ -24,12 +25,12 @@ source "package/nano/Config.in"
 source "package/osiris/Config.in"
 source "package/php4/Config.in"
 source "package/php5/Config.in"
-menu "sablevm - a Java Virtual Machine (JVM) implementation"
+menu "sablevm........................... A Java Virtual Machine (JVM) implementation"
 source "package/sablevm/Config.in"
 source "package/sablevm-classpath/Config.in"
 source "package/libffi-sable/Config.in"
 endmenu
-menu "rrdtool - Round-Robin Database (RRD) libraries and tools"
+menu "rrdtool........................... Round-Robin Database (RRD) libraries and tools"
 source "package/rrdtool/Config.in"
 source "package/rrdtool1/Config.in"
 source "package/rrdcollect/Config.in"
@@ -37,8 +38,6 @@ endmenu
 source "package/screen/Config.in"
 
 comment "Networking"
-source "package/6tunnel/Config.in"
-source "package/aiccu/Config.in"
 source "package/aircrack/Config.in"
 source "package/amwall/Config.in"
 source "package/arpd/Config.in"
@@ -78,9 +77,7 @@ source "package/linux-atm/Config.in"
 source "package/maradns/Config.in"
 source "package/mini_httpd/Config.in"
 source "package/mini_sendmail/Config.in"
-source "package/miredo/Config.in"
 source "package/mtr/Config.in"
-source "package/ndisc/Config.in"
 source "package/net-snmp/Config.in"
 source "package/netstat-nat/Config.in"
 source "package/nfs-server/Config.in"
@@ -102,7 +99,6 @@ source "package/rp-pppoe/Config.in"
 source "package/pptp/Config.in"
 source "package/pptpd/Config.in"
 source "package/quagga/Config.in"
-source "package/radvd/Config.in"
 source "package/rarpd/Config.in"
 source "package/reaim/Config.in"
 source "package/robocfg/Config.in"
@@ -138,6 +134,13 @@ source "package/wrt-radauth/Config.in"
 source "package/xinetd/Config.in"
 source "package/xsupplicant/Config.in"
 
+comment "IPv6"
+source "package/6tunnel/Config.in"
+source "package/aiccu/Config.in"
+source "package/miredo/Config.in"
+source "package/ndisc/Config.in"
+source "package/radvd/Config.in"
+
 comment "Libraries"
 source "package/cgilib/Config.in"
 source "package/glib/Config.in"
@@ -195,9 +198,8 @@ source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/uclibc++/Config.in"
 source "package/zlib/Config.in"
-source "package/irssi/Config.in"
 
-comment "Multimedia ---"
+comment "Multimedia"
 source "package/gmediaserver/Config.in"
 source "package/icecast/Config.in"
 source "package/mpd/Config.in"
@@ -205,25 +207,25 @@ source "package/mt-daapd/Config.in"
 source "package/palantir/Config.in"
 source "package/setpwc/Config.in"
 
-comment "Serial communications & terminal emulation ---"
+comment "Serial communications & terminal emulation"
 source "package/microcom/Config.in"
 source "package/picocom/Config.in"
 source "package/setserial/Config.in"
 
-comment "Utilities ---"
+comment "Utilities"
 source "package/gdbserver/Config.in"
 source "package/madwifi-tools/Config.in"
 source "package/usbutils/Config.in"  # lsusb
 source "package/strace/Config.in"
 
-comment "FileSystems related ---"
+comment "FileSystems related"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
 source "package/shfs/Config.in"
 source "package/util-linux/Config.in"
 
-comment "Bluetooth related ---"
+comment "Bluetooth"
 source "package/bluez-libs/Config.in"
 source "package/bluez-utils/Config.in"
 
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 0a5f00fdf..6ca65ccec 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -10,9 +10,9 @@ package-$(BR2_PACKAGE_ARPD) += arpd
 package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
 package-$(BR2_PACKAGE_ASTERISK) += asterisk
-package-$(BR2_PACKAGE_ATFP) += atftp
+package-$(BR2_COMPILE_ATFTP) += atftp
 package-$(BR2_COMPILE_AVAHI) += avahi
-package-$(BR2_PACKAGE_BIND) += bind
+package-$(BR2_COMPILE_BIND) += bind
 package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
 package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
 package-$(BR2_PACKAGE_BRIDGE) += bridge
@@ -23,9 +23,10 @@ package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_COMPILE_CURL) += curl
-package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_COMPILE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_COMPILE_DB) += libdb
 package-$(BR2_PACKAGE_DECO) += deco
-package-$(BR2_PACKAGE_DHCP) += dhcp
+package-$(BR2_COMPILE_DHCP) += dhcp
 package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_DOSFSTOOLS) += dosfstools
@@ -41,30 +42,30 @@ package-$(BR2_PACKAGE_FPING) += fping
 package-$(BR2_PACKAGE_FPROBE) += fprobe
 package-$(BR2_PACKAGE_FPROBE_ULOG) += fprobe-ulog
 package-$(BR2_PACKAGE_FREERADIUS) += freeradius
-package-$(BR2_PACKAGE_FREETYPE) += freetype
+package-$(BR2_COMPILE_FREETYPE) += freetype
 package-$(BR2_PACKAGE_FRICKIN) += frickin
-package-$(BR2_PACKAGE_FUSE) += fuse
+package-$(BR2_COMPILE_FUSE) += fuse
 package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
-package-$(BR2_PACKAGE_GLIB) += glib
+package-$(BR2_COMPILE_GLIB) += glib
 package-$(BR2_PACKAGE_GMEDIASERVER) += gmediaserver
-package-$(BR2_PACKAGE_GMP) += gmp
+package-$(BR2_COMPILE_GMP) += gmp
 package-$(BR2_COMPILE_GNUTLS) += gnutls
 package-$(BR2_PACKAGE_GPSD) += gpsd
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
-package-$(BR2_PACKAGE_HOWL) += howl
+package-$(BR2_COMPILE_HOWL) += howl
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ICECAST) += icecast
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
 package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg
-package-$(BR2_PACKAGE_IPROUTE2) += iproute2
+package-$(BR2_COMPILE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_IPSET) += ipset
-package-$(BR2_PACKAGE_IPTABLES) += iptables
+package-$(BR2_COMPILE_IPTABLES) += iptables
 package-$(BR2_PACKAGE_IPTRAF) += iptraf
 package-$(BR2_PACKAGE_IRSSI) += irssi
 package-$(BR2_COMPILE_JPEG) += jpeg
-package-$(BR2_PACKAGE_KISMET) += kismet
+package-$(BR2_COMPILE_KISMET) += kismet
 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LESS) += less
@@ -72,7 +73,6 @@ package-$(BR2_PACKAGE_LIBAMSEL) += libamsel
 package-$(BR2_PACKAGE_LIBAO) += libao
 package-$(BR2_PACKAGE_LIBART) += libart
 package-$(BR2_PACKAGE_LIBDAEMON) += libdaemon
-package-$(BR2_PACKAGE_LIBDB) += libdb
 package-$(BR2_PACKAGE_LIBDNET) += libdnet
 package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_LIBEVENT) += libevent
@@ -91,7 +91,7 @@ package-$(BR2_PACKAGE_LIBPCAP) += libpcap
 package-$(BR2_PACKAGE_LIBPNG) += libpng
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
 package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
-package-$(BR2_PACKAGE_LIBTOOL) += libtool
+package-$(BR2_COMPILE_LIBTOOL) += libtool
 package-$(BR2_PACKAGE_LIBUPNP) += libupnp
 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LIBVORBIS) += libvorbis
@@ -100,11 +100,11 @@ package-$(BR2_PACKAGE_LIBXML2) += libxml2
 package-$(BR2_PACKAGE_LIBXSLT) += libxslt
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
 package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm
-package-$(BR2_PACKAGE_LUA) += lua
-package-$(BR2_PACKAGE_LZO) += lzo
+package-$(BR2_COMPILE_LUA) += lua
+package-$(BR2_COMPILE_LZO) += lzo
 package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools
 package-$(BR2_PACKAGE_MARADNS) += maradns
-package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
+package-$(BR2_COMPILE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_MICROCOM) += microcom
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
@@ -115,9 +115,9 @@ package-$(BR2_PACKAGE_MPD) += mpd
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
 package-$(BR2_PACKAGE_MTD) += mtd
 package-$(BR2_PACKAGE_MTR) += mtr
-package-$(BR2_PACKAGE_MYSQL) += mysql
+package-$(BR2_COMPILE_MYSQL) += mysql
 package-$(BR2_PACKAGE_NANO) += nano
-package-$(BR2_PACKAGE_NCURSES) += ncurses
+package-$(BR2_COMPILE_NCURSES) += ncurses
 package-$(BR2_COMPILE_NDISC6) += ndisc
 package-$(BR2_COMPILE_NET_SNMP) += net-snmp
 package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat
@@ -127,33 +127,33 @@ package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
 package-$(BR2_PACKAGE_NVRAM) += nvram
 package-$(BR2_PACKAGE_OLSRD) += olsrd
-package-$(BR2_PACKAGE_OPENCDK) += opencdk
-package-$(BR2_PACKAGE_OPENLDAP) += openldap
+package-$(BR2_COMPILE_OPENCDK) += opencdk
+package-$(BR2_COMPILE_OPENLDAP) += openldap
 package-$(BR2_PACKAGE_OPENNTPD) += openntpd
-package-$(BR2_PACKAGE_OPENSSH) += openssh
-package-$(BR2_PACKAGE_OPENSSL) += openssl
+package-$(BR2_COMPILE_OPENSSH) += openssh
+package-$(BR2_COMPILE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
-package-$(BR2_PACKAGE_OSIRIS) += osiris
+package-$(BR2_COMPILE_OSIRIS) += osiris
 package-$(BR2_PACKAGE_PALANTIR) += palantir
 package-$(BR2_PACKAGE_P910ND) += p910nd
 package-$(BR2_PACKAGE_PARPROUTED) += parprouted
-package-$(BR2_PACKAGE_PCRE) += pcre
+package-$(BR2_COMPILE_PCRE) += pcre
 package-$(BR2_COMPILE_PHP4) += php4
 package-$(BR2_COMPILE_PHP5) += php5
 package-$(BR2_PACKAGE_PICOCOM) += picocom
-package-$(BR2_PACKAGE_PMACCT) += pmacct
-package-$(BR2_PACKAGE_POPT) += popt
+package-$(BR2_COMPILE_PMACCT) += pmacct
+package-$(BR2_COMPILE_POPT) += popt
 package-$(BR2_PACKAGE_PORTMAP) += portmap
 package-$(BR2_PACKAGE_PORTSENTRY) += portsentry
-package-$(BR2_PACKAGE_POSTGRESQL) += postgresql
+package-$(BR2_COMPILE_POSTGRESQL) += postgresql
 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_RARPD) += rarpd
-package-$(BR2_PACKAGE_READLINE) += readline
+package-$(BR2_COMPILE_READLINE) += readline
 package-$(BR2_PACKAGE_REAIM) += reaim
 package-$(BR2_PACKAGE_ROBOCFG) += robocfg
 package-$(BR2_COMPILE_RP_PPPOE) += rp-pppoe
@@ -163,7 +163,7 @@ package-$(BR2_COMPILE_RRDTOOL1) += rrdtool1
 package-$(BR2_COMPILE_RRS) += rrs
 package-$(BR2_PACKAGE_RSYNC) += rsync
 package-$(BR2_PACKAGE_SABLEVM) += sablevm
-package-$(BR2_PACKAGE_SABLEVM_CLASSPATH) += sablevm-classpath
+package-$(BR2_COMPILE_SABLEVM_CLASSPATH) += sablevm-classpath
 package-$(BR2_COMPILE_SAMBA) += samba
 package-$(BR2_PACKAGE_SCDP) += scdp
 package-$(BR2_PACKAGE_SCREEN) += screen
@@ -172,14 +172,14 @@ package-$(BR2_PACKAGE_SER) += ser
 package-$(BR2_PACKAGE_SETPWC) += setpwc
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
 package-$(BR2_PACKAGE_SHAT) += shat
-package-$(BR2_PACKAGE_SHFS) += shfs
+package-$(BR2_COMPILE_SHFS) += shfs
 package-$(BR2_PACKAGE_SIPROXD) += siproxd
 package-$(BR2_PACKAGE_SIPSAK) += sipsak
-package-$(BR2_PACKAGE_SNORT) += snort
+package-$(BR2_COMPILE_SNORT) += snort
 package-$(BR2_PACKAGE_SOCAT) += socat
-package-$(BR2_PACKAGE_SPEEX) += speex
-package-$(BR2_PACKAGE_SQLITE) += sqlite
-package-$(BR2_PACKAGE_SQLITE2) += sqlite2
+package-$(BR2_COMPILE_SPEEX) += speex
+package-$(BR2_COMPILE_SQLITE) += sqlite
+package-$(BR2_COMPILE_SQLITE2) += sqlite2
 package-$(BR2_PACKAGE_SSMTP) += ssmtp
 package-$(BR2_PACKAGE_SRELAY) += srelay
 package-$(BR2_PACKAGE_STRACE) += strace
@@ -190,7 +190,7 @@ package-$(BR2_PACKAGE_TTCP) += ttcp
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_UPDATEDD) += updatedd
-package-$(BR2_PACKAGE_USBUTILS) += usbutils
+package-$(BR2_COMPILE_USBUTILS) += usbutils
 package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
 package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
@@ -403,10 +403,10 @@ php5-compile: expat-compile
 endif
 
 pmacct-compile: libpcap-compile
-ifneq ($(BR2_PACKAGE_PMACCT_MYSQL),)
+ifneq ($(BR2_COMPILE_PMACCT_MYSQL),)
 pmacct-compile: mysql-compile
 endif
-ifneq ($(BR2_PACKAGE_PMACCT_PGSQL),)
+ifneq ($(BR2_COMPILE_PMACCT_PGSQL),)
 pmacct-compile: postgresql-compile
 endif
 
diff --git a/openwrt/package/aiccu/Config.in b/openwrt/package/aiccu/Config.in
index cc2bfe21d..b8ba014c1 100644
--- a/openwrt/package/aiccu/Config.in
+++ b/openwrt/package/aiccu/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AICCU
-	tristate "aiccu - SixXS Automatic IPv6 Connectivity Client Utility"
+	prompt "aiccu............................. SixXS Automatic IPv6 Connectivity Client Utility"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_IPV6
 	select BR2_PACKAGE_LIBPTHREAD
@@ -7,5 +8,4 @@ config BR2_PACKAGE_AICCU
 	  SixXS Automatic IPv6 Connectivity Client Utility
 	  
 	  For more information about SixXS check http://www.sixxs.net/
-	  
 
diff --git a/openwrt/package/aircrack/Config.in b/openwrt/package/aircrack/Config.in
index 05e134efe..2e9b98e30 100644
--- a/openwrt/package/aircrack/Config.in
+++ b/openwrt/package/aircrack/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AIRCRACK
-	tristate "aircrack - a set of tools for auditing wireless networks"
+	prompt "aircrack.......................... A set of tools for auditing wireless networks"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	help
@@ -11,5 +12,4 @@ config BR2_PACKAGE_AIRCRACK
 	   * airodump: 802.11 packet capture program
 	  
 	  http://www.cr0.net:8040/code/network/aircrack/
-	  
 
diff --git a/openwrt/package/amwall/Config.in b/openwrt/package/amwall/Config.in
index 978c63ee6..af5efe9b0 100644
--- a/openwrt/package/amwall/Config.in
+++ b/openwrt/package/amwall/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_AMWALL
-        tristate "amwall - pf to iptables "
+	prompt "amwall............................ PF to iptables"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBAMSEL
-        help
-          See 
-
-          http://amselinux.de/
+	help
+	  PF for iptables
+	  
+	  http://amselinux.de/
 
diff --git a/openwrt/package/arpd/Config.in b/openwrt/package/arpd/Config.in
index 504f9fada..11607baf4 100644
--- a/openwrt/package/arpd/Config.in
+++ b/openwrt/package/arpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ARPD
-	tristate "arpd - fake ARP replies"
+	prompt "arpd.............................. A daemon to fake ARP replies"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBDNET
diff --git a/openwrt/package/arptables/Config.in b/openwrt/package/arptables/Config.in
index e9c33a721..6583d32fa 100644
--- a/openwrt/package/arptables/Config.in
+++ b/openwrt/package/arptables/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_ARPTABLES
-	tristate "arptables - ARP firewall administration utility"
+	prompt "arptables......................... ARP firewall administration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  ARP Firewalling (arptables)
 	  
 	  http://ebtables.sourceforge.net/
-	  
 
diff --git a/openwrt/package/arpwatch/Config.in b/openwrt/package/arpwatch/Config.in
index 374ab7159..b69ec7a25 100644
--- a/openwrt/package/arpwatch/Config.in
+++ b/openwrt/package/arpwatch/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ARPWATCH
-	tristate "arpwatch - Ethernet station activity monitor"
+	prompt "arpwatch.......................... Ethernet station activity monitor"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Ethernet monitor program for keeping track of ethernet/ip address pairings
-	  
+
diff --git a/openwrt/package/asterisk/Config.in b/openwrt/package/asterisk/Config.in
index 435ab8257..963e372e2 100644
--- a/openwrt/package/asterisk/Config.in
+++ b/openwrt/package/asterisk/Config.in
@@ -1,7 +1,7 @@
-menu "asterisk - Complete open source PBX"
+menu "asterisk.......................... Complete open source PBX"
 
 config BR2_PACKAGE_ASTERISK
-	prompt "asterisk - Complete open source PBX"
+	prompt "asterisk.......................... Complete open source PBX"
 	tristate
 	default m if CONFIG_DEVEL
 	help
@@ -11,10 +11,9 @@ config BR2_PACKAGE_ASTERISK
 	  equipment using relatively inexpensive hardware.
 	  
 	  http://www.asterisk.org/
-	  
 
 config BR2_PACKAGE_ASTERISK_CHAN_BLUETOOTH
-	prompt "...-chan-bluetooth - Bluetooth HandsFreeProfile support for Asterisk"
+	prompt   "asterisk-chan-bluetooth......... Bluetooth HandsFreeProfile support for Asterisk"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -23,7 +22,7 @@ config BR2_PACKAGE_ASTERISK_CHAN_BLUETOOTH
 	  The Bluetooth HandsFreeProfile support for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CHAN_MGCP
-	prompt "...-chan-mgcp - Media Gateway Control Protocol implementation"
+	prompt   "asterisk-chan-mgcp.............. Media Gateway Control Protocol implementation"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -31,7 +30,7 @@ config BR2_PACKAGE_ASTERISK_CHAN_MGCP
 	  Media Gateway Control Protocol implementation for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CHAN_SKINNY
-	prompt "...-chan-skinny - Skinny Client Control Protocol implementation"
+	prompt   "asterisk-chan-skinny............ Skinny Client Control Protocol implementation"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -39,7 +38,7 @@ config BR2_PACKAGE_ASTERISK_CHAN_SKINNY
 	  Skinny Client Control Protocol implementation for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CODEC_ILBC
-	prompt "...-codec-ilbc - Internet Low Bitrate Codec (ILBC) Translator"
+	prompt   "asterisk-codec-ilbc............. Internet Low Bitrate Codec (ILBC) Translator"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -47,7 +46,7 @@ config BR2_PACKAGE_ASTERISK_CODEC_ILBC
 	  The Internet Low Bitrate Codec (ILBC) Translator for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CODEC_LPC10
-	prompt "...-codec-lpc10 - LPC10 (Linear Predictor Code) 2.4kbps Voice Coder"
+	prompt   "asterisk-codec-lpc10............ LPC10 (Linear Predictor Code) 2.4kbps Voice Coder"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -55,7 +54,7 @@ config BR2_PACKAGE_ASTERISK_CODEC_LPC10
 	  The LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
 
 config BR2_PACKAGE_ASTERISK_CODEC_SPEEX
-	prompt "...-codec-speex - Speex/PCM16 Codec Translator"
+	prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -64,7 +63,7 @@ config BR2_PACKAGE_ASTERISK_CODEC_SPEEX
 	  The Speex speech compression codec for Asterisk
 
 config BR2_PACKAGE_ASTERISK_PBX_DUNDI
-	prompt "...-pbx-dundi - Distributed Universal Number Discovery (DUNDi) support"
+	prompt   "asterisk-pbx-dundi.............. Distributed Universal Number Discovery (DUNDi) support"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -72,7 +71,7 @@ config BR2_PACKAGE_ASTERISK_PBX_DUNDI
 	  Distributed Universal Number Discovery (DUNDi) support for Asterisk
 
 config BR2_PACKAGE_ASTERISK_RES_AGI
-	prompt "...-res-agi - Asterisk Gateway Interface module"
+	prompt   "asterisk-res-agi................ Asterisk Gateway Interface module"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -80,7 +79,7 @@ config BR2_PACKAGE_ASTERISK_RES_AGI
 	  Asterisk Gateway Interface module
 
 config BR2_PACKAGE_ASTERISK_MYSQL
-	prompt "...-mysql - MySQL modules"
+	prompt   "asterisk-mysql.................. MySQL modules"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -89,7 +88,7 @@ config BR2_PACKAGE_ASTERISK_MYSQL
 	  MySQL modules for Asterisk
 
 config BR2_PACKAGE_ASTERISK_PGSQL
-	prompt "...-pgsql - PostgreSQL modules"
+	prompt   "asterisk-pgsql.................. PostgreSQL modules"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -98,7 +97,7 @@ config BR2_PACKAGE_ASTERISK_PGSQL
 	  PostgreSQL modules for Asterisk
 	  
 config BR2_PACKAGE_ASTERISK_SOUNDS
-	prompt "...-sounds - Sound files"
+	prompt   "asterisk-sounds................. Sound files"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
@@ -106,7 +105,7 @@ config BR2_PACKAGE_ASTERISK_SOUNDS
 	  Sound files for Asterisk
 
 config BR2_PACKAGE_ASTERISK_VOICEMAIL
-	prompt "...-voicemail - Voicemail support"
+	prompt   "asterisk-voicemail.............. Voicemail support"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
diff --git a/openwrt/package/atftp/Config.in b/openwrt/package/atftp/Config.in
index aad1bdae2..c84e316cb 100644
--- a/openwrt/package/atftp/Config.in
+++ b/openwrt/package/atftp/Config.in
@@ -1,11 +1,24 @@
+#menu "atftp............................. TFTP implementation"
+
+config BR2_COMPILE_ATFTP
+	bool
+	default n
+	depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD
+	
 config BR2_PACKAGE_ATFTP
-	tristate "atftp - a tftp client"
+	prompt "atftp............................. TFTP client"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_ATFTP
 	help
-	tftp client
+	  TFTP client
 
 config BR2_PACKAGE_ATFTPD
-	tristate "atftpd - a tftp server"
+	prompt "atftpd............................ TFTP server"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_ATFTP
 	help
-	tftp server 
+	  TFTP server 
+
+#endmenu
diff --git a/openwrt/package/avahi/Config.in b/openwrt/package/avahi/Config.in
index cba5b5de8..1f2804c62 100644
--- a/openwrt/package/avahi/Config.in
+++ b/openwrt/package/avahi/Config.in
@@ -1,4 +1,4 @@
-menu "avahi - An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation"
+menu "avahi............................. An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation"
 
 config BR2_COMPILE_AVAHI
 	bool
@@ -6,7 +6,8 @@ config BR2_COMPILE_AVAHI
 	depends BR2_PACKAGE_AVAHI_DAEMON || BR2_PACKAGE_AVAHI_DNSCONFD || BR2_PACKAGE_LIBAVAHI
 
 config BR2_PACKAGE_AVAHI_DAEMON
-	tristate "avahi-daemon - an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)"
+	prompt   "avahi-daemon.................... An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	select BR2_PACKAGE_LIBAVAHI
@@ -22,10 +23,10 @@ config BR2_PACKAGE_AVAHI_DAEMON
 	  http://www.freedesktop.org/Software/Avahi
 	  
 	  This package contains an mDNS/DNS-SD daemon.
-	  
 
 config BR2_PACKAGE_AVAHI_DNSCONFD
-	tristate "avahi-dnsconfd - an Unicast DNS server from mDNS/DNS-SD configuration daemon"
+	prompt     "avahi-dnsconfd................ An Unicast DNS server from mDNS/DNS-SD configuration daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	depends BR2_PACKAGE_AVAHI_DAEMON
@@ -42,10 +43,10 @@ config BR2_PACKAGE_AVAHI_DNSCONFD
 	  This package contains an Unicast DNS server from mDNS/DNS-SD configuration 
 	  daemon, which may be used to configure conventional DNS servers using mDNS 
 	  in a DHCP-like fashion. Especially useful on IPv6.
-	  
 
 config BR2_PACKAGE_LIBAVAHI
-	tristate "libavahi - an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library)"
+	prompt   "libavahi........................ An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	help
@@ -59,6 +60,5 @@ config BR2_PACKAGE_LIBAVAHI
 	  http://www.freedesktop.org/Software/Avahi
 	  
 	  This package contains the mDNS/DNS-SD shared libraries, used by other programs.
-	  
 
 endmenu
diff --git a/openwrt/package/bind/Config.in b/openwrt/package/bind/Config.in
index 910c61c2e..1acb5857e 100644
--- a/openwrt/package/bind/Config.in
+++ b/openwrt/package/bind/Config.in
@@ -1,25 +1,34 @@
-menu "bind - DNS server implementation"
+#menu "bind.............................. A DNS server implementation"
 
-config BR2_PACKAGE_BIND
-	bool "bind - popular dns server"
-	default y if CONFIG_DEVEL
+config BR2_COMPILE_BIND
+	bool
+	default n
+	depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER
+	
+config BR2_PACKAGE_BIND_CLIENT
+	prompt "bind-client....................... A dynamic DNS client"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
 	help
-	  DNS server implementation
+	  A DNS dynamic client (nsupdate)
 	  
-	  http://www.isc.org/
+	  http://www.isc.org/sw/bind/
 	  
 	  Depends: openssl
 
 config BR2_PACKAGE_BIND_SERVER
-	tristate "named - popular dns server"
+	prompt "bind-server....................... A DNS server"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
 	select BR2_PACKAGE_LIBOPENSSL
-	depends BR2_PACKAGE_BIND
-
-config BR2_PACKAGE_BIND_CLIENT
-	tristate "nsupdate - dynamic dns client"
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LIBOPENSSL
-	depends BR2_PACKAGE_BIND
+	help
+	  A DNS server (named)
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
 
-endmenu
+#endmenu
diff --git a/openwrt/package/bluez-libs/Config.in b/openwrt/package/bluez-libs/Config.in
index 28fab313c..490771426 100644
--- a/openwrt/package/bluez-libs/Config.in
+++ b/openwrt/package/bluez-libs/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_BLUEZ_LIBS
-	tristate "bluez-libs - bluetooth library"
+	prompt "bluez-libs........................ Bluetooth library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Bluez libs. 
 	  
 	  http://bluez.org
-	  
+
diff --git a/openwrt/package/bluez-utils/Config.in b/openwrt/package/bluez-utils/Config.in
index 774ddea13..7875742e7 100644
--- a/openwrt/package/bluez-utils/Config.in
+++ b/openwrt/package/bluez-utils/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BLUEZ_UTILS
-	tristate "bluez-utils - bluetooth utils"
+	prompt "bluez-utils....................... Bluetooth utilities"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_GLIB
+	select BR2_PACKAGE_GLIB1
 	select BR2_PACKAGE_BLUEZ_LIBS
 	help
 	  Bluez utils. 
@@ -9,3 +10,4 @@ config BR2_PACKAGE_BLUEZ_UTILS
 	  http://bluez.org
 	  
 	  Depends: libpthread, bluez-libs
+
diff --git a/openwrt/package/bridge/Config.in b/openwrt/package/bridge/Config.in
index 998dff1cd..b7f7babc6 100644
--- a/openwrt/package/bridge/Config.in
+++ b/openwrt/package/bridge/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_BRIDGE
-	tristate "bridge - Ethernet bridging configuration utility"
+	prompt "bridge............................ Ethernet bridging configuration utility"
+	tristate
 	default y
 	help
 	  Manage ethernet bridging; a way to connect networks together to 
 	  form a larger network.
 	  
 	  http://bridge.sourceforge.net/
-	  
 
diff --git a/openwrt/package/busybox/Config.in b/openwrt/package/busybox/Config.in
index 4a8fb4ea0..e79aef7d3 100644
--- a/openwrt/package/busybox/Config.in
+++ b/openwrt/package/busybox/Config.in
@@ -1,5 +1,8 @@
+menu "busybox........................... The Swiss Army Knife of embedded Linux"
+
 config BR2_PACKAGE_BUSYBOX
-	bool "busybox - The Swiss Army Knife of embedded Linux"
+	prompt "busybox........................... The Swiss Army Knife of embedded Linux"
+	bool
 	default y
 	help
 	  The Swiss Army Knife of embedded Linux.  It slices, it dices, it
@@ -16,12 +19,14 @@ config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default n
 	help
 	  Use the latest busybox CVS snapshot instead of release.
-
-	  For fun, you should say Y.
 	  
+	  For fun, you should say Y.
+
 menu "Busybox Configuration"
 	depends BR2_PACKAGE_BUSYBOX
 
 source package/busybox/config/Config.in
 
 endmenu
+
+endmenu
diff --git a/openwrt/package/bwm/Config.in b/openwrt/package/bwm/Config.in
index f6b9f7a53..b50f023bf 100644
--- a/openwrt/package/bwm/Config.in
+++ b/openwrt/package/bwm/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BWM
-	tristate "bwm - Very tiny BandWidth Monitor"
+	prompt "bwm............................... A very tiny BandWidth Monitor"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A very tiny bandwidth monitor.
-	  
+
diff --git a/openwrt/package/cgilib/Config.in b/openwrt/package/cgilib/Config.in
index ac5088451..23364d1b7 100644
--- a/openwrt/package/cgilib/Config.in
+++ b/openwrt/package/cgilib/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CGILIB
-	tristate "cgilib - Simple CGI Library"
+	prompt "cgilib............................ Simple CGI Library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	help
@@ -8,5 +9,4 @@ config BR2_PACKAGE_CGILIB
 	  FORM variables, sets HTTP Cookies and reads them.
 	  
 	  http://www.infodrom.org/projects/cgilib/
-	  
 
diff --git a/openwrt/package/chillispot/Config.in b/openwrt/package/chillispot/Config.in
index b567a7ce7..34ffc6e07 100644
--- a/openwrt/package/chillispot/Config.in
+++ b/openwrt/package/chillispot/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_CHILLISPOT
-	tristate "chillispot - Wireless LAN access point controller"
+	prompt "chillispot........................ Wireless LAN access point controller"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_KMOD_TUN
 	help
 	  ChilliSpot is an open source captive portal or wireless LAN
 	  access point controller. It is used for authenticating users
@@ -11,4 +13,4 @@ config BR2_PACKAGE_CHILLISPOT
 	  radius server.
 	  
 	  http://www.chillispot.org/
-	  
+
diff --git a/openwrt/package/cifsmount/Config.in b/openwrt/package/cifsmount/Config.in
index 6c02377cc..cc82a84d8 100644
--- a/openwrt/package/cifsmount/Config.in
+++ b/openwrt/package/cifsmount/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_CIFSMOUNT
-	tristate "cifsmount - Helper utility for mounting remote CIFS shares"
+	prompt "cifsmount......................... Helper utility for mounting remote CIFS shares"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  An user space helper for mounting remote CIFS shares
-	  
\ No newline at end of file
+
diff --git a/openwrt/package/cups/Config.in b/openwrt/package/cups/Config.in
index 7f273d73e..5358754b8 100644
--- a/openwrt/package/cups/Config.in
+++ b/openwrt/package/cups/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_CUPS
-	tristate "cups - Common UNIX Printing System"
+	prompt "cups.............................. Common UNIX Printing System"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A printer spooling system for devices with USB or LP support
 	  
 	  http://www.cups.org/
-	  
+
diff --git a/openwrt/package/curl/Config.in b/openwrt/package/curl/Config.in
index 2506350b5..f3bf79f40 100644
--- a/openwrt/package/curl/Config.in
+++ b/openwrt/package/curl/Config.in
@@ -4,7 +4,8 @@ config BR2_COMPILE_CURL
 	depends BR2_PACKAGE_LIBCURL
 
 config BR2_PACKAGE_LIBCURL
-	tristate "libcurl - A client-side URL transfer library"
+	prompt "libcurl........................... A client-side URL transfer library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_CURL
 	select BR2_PACKAGE_LIBOPENSSL
@@ -13,15 +14,14 @@ config BR2_PACKAGE_LIBCURL
 	  A client-side URL transfer library.
 	  
 	  http://curl.haxx.se/
-	  
 
 config BR2_PACKAGE_CURL
-	tristate "curl - A client-side URL transfer tool"
+	prompt   "curl............................ A client-side URL transfer tool"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBCURL
 	help
 	  A client-side URL transfer tool.
 	  
 	  http://curl.haxx.se/
-	  
 
diff --git a/openwrt/package/cyrus-sasl/Config.in b/openwrt/package/cyrus-sasl/Config.in
index 25f49fd4c..de3c3d3fb 100644
--- a/openwrt/package/cyrus-sasl/Config.in
+++ b/openwrt/package/cyrus-sasl/Config.in
@@ -1,12 +1,15 @@
+config BR2_COMPILE_CYRUS_SASL
+	bool
+	default n
+	depends BR2_PACKAGE_LIBSASL2
+
 config BR2_PACKAGE_LIBSASL2
-	tristate "libsasl2 - General purpose authentication library"
+	prompt "libsasl2.......................... General purpose authentication library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_CYRUS_SASL
 	help
 	  A general purpose authentication library.
 	  
 	  http://asg.web.cmu.edu/sasl/
-	  
 
-config BR2_PACKAGE_CYRUS_SASL
-	tristate
-	default BR2_PACKAGE_LIBSASL2
diff --git a/openwrt/package/deco/Config.in b/openwrt/package/deco/Config.in
index b87dcdf3f..3b0682d53 100644
--- a/openwrt/package/deco/Config.in
+++ b/openwrt/package/deco/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DECO
-	tristate "deco - Text-based full featured file manager"
+	prompt "deco.............................. Text-based full featured file manager"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
@@ -7,5 +8,4 @@ config BR2_PACKAGE_DECO
 	  file manager.
 	  
 	  http://deco.sourceforge.net/
-	  
 
diff --git a/openwrt/package/dhcp-forwarder/Config.in b/openwrt/package/dhcp-forwarder/Config.in
index 9d67b0ebb..2c99809ef 100644
--- a/openwrt/package/dhcp-forwarder/Config.in
+++ b/openwrt/package/dhcp-forwarder/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_DHCP_FORWARDER
-	tristate "dhcp-forwarder - DHCP relay agent"
+	prompt "dhcp-forwarder.................... DHCP relay agent"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A DHCP relay agent
 	  
 	  http://www.nongnu.org/dhcp-fwd/
-	  
 
diff --git a/openwrt/package/dhcp/Config.in b/openwrt/package/dhcp/Config.in
index 9a3a71b69..5449c207b 100644
--- a/openwrt/package/dhcp/Config.in
+++ b/openwrt/package/dhcp/Config.in
@@ -1,27 +1,30 @@
-config BR2_PACKAGE_DHCP
-	tristate
+#menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation"
+
+config BR2_COMPILE_DHCP
+	bool
 	default n
 	depends BR2_PACKAGE_DHCP_RELAY || BR2_PACKAGE_DHCP_SERVER
 
 config BR2_PACKAGE_DHCP_RELAY
-	tristate "dhcp-relay - ISC DHCP relay"
+	prompt "dhcp-relay........................ ISC DHCP relay"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_DHCP
+	select BR2_COMPILE_DHCP
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration 
 	  Protocol) relay daemon.
 	  
 	  http://www.isc.org/
-	  
 
 config BR2_PACKAGE_DHCP_SERVER
-	tristate "dhcp-server - ISC DHCP server"
+	prompt "dhcp-server....................... ISC DHCP server"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_DHCP
+	select BR2_COMPILE_DHCP
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration 
 	  Protocol) server daemon.
 	  
 	  http://www.isc.org/
-	  
 
+#endmenu
diff --git a/openwrt/package/dnsmasq/Config.in b/openwrt/package/dnsmasq/Config.in
index 16aa8ce1c..b20bf7362 100644
--- a/openwrt/package/dnsmasq/Config.in
+++ b/openwrt/package/dnsmasq/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_DNSMASQ
-	tristate "dnsmasq - Lightweight DNS and DHCP server"
+	prompt "dnsmasq........................... Lightweight DNS and DHCP server"
+	tristate
 	default y
 	help
 	  A lightweight DNS and DHCP server.  It is intended to provide 
 	  coupled DNS and DHCP service to a LAN.
 	  
 	  http://www.thekelleys.org.uk/dnsmasq/
-	  
+
diff --git a/openwrt/package/dosfstools/Config.in b/openwrt/package/dosfstools/Config.in
index 2bb61c549..0e700347e 100644
--- a/openwrt/package/dosfstools/Config.in
+++ b/openwrt/package/dosfstools/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_DOSFSTOOLS
-	tristate "dosfstools - Utilities to create and check MS-DOS FAT filesystems"
+	prompt "dosfstools........................ Utilities to create and check MS-DOS FAT filesystems"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Utilities to create and check MS-DOS FAT filesystems.
 	  
 	  ftp://ftp.uni-erlangen.de:/pub/Linux/LOCAL/dosfstools/
-	  
 
diff --git a/openwrt/package/dropbear/Config.in b/openwrt/package/dropbear/Config.in
index 54d7284ee..0c4b2f452 100644
--- a/openwrt/package/dropbear/Config.in
+++ b/openwrt/package/dropbear/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_DROPBEAR
-	tristate "dropbear - Small SSH 2 client/server"
+	prompt "dropbear.......................... Small SSH 2 client/server"
+	tristate
 	default y
 	select BR2_PACKAGE_ZLIB
 	help
 	  A small SSH 2 server/client designed for small memory environments.
 	  
 	  http://matt.ucc.asn.au/dropbear/
-	  
+
diff --git a/openwrt/package/dsniff/Config.in b/openwrt/package/dsniff/Config.in
index f68eced1e..372274e48 100644
--- a/openwrt/package/dsniff/Config.in
+++ b/openwrt/package/dsniff/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DSNIFF
-	tristate "dsniff - network auditing and penetration testing"
+	prompt "dsniff............................ A collection of tools for betwork auditing and penetration testing"
+	tristate
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBNIDS
 	select BR2_PACKAGE_LIBNET
@@ -7,7 +8,7 @@ config BR2_PACKAGE_DSNIFF
 	select BR2_PACKAGE_LIBGDBM
 	default m if CONFIG_DEVEL
 	help
+	  A collection of tools for network auditing and penetration testing
+	  
+	  http://www.monkey.org/~dugsong/dsniff/
 
-	collection of tools for network auditing and penetration testing
-
-	http://www.monkey.org/~dugsong/dsniff/
diff --git a/openwrt/package/e2fsprogs/Config.in b/openwrt/package/e2fsprogs/Config.in
index 029d396f7..3f8b3da8d 100644
--- a/openwrt/package/e2fsprogs/Config.in
+++ b/openwrt/package/e2fsprogs/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_E2FSPROGS
-	tristate "e2fsprogs - Ext2/3 filesystem utilities"
+	prompt "e2fsprogs......................... Ext2/3 filesystem utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  This package contains essential ext2 filesystem utilities which consists of 
@@ -7,4 +8,4 @@ config BR2_PACKAGE_E2FSPROGS
 	  filesystem utilities.
 	  
 	  http://e2fsprogs.sourceforge.net/
-	  
+
diff --git a/openwrt/package/ebtables/Config.in b/openwrt/package/ebtables/Config.in
index 454d02fe8..e8fb884f7 100644
--- a/openwrt/package/ebtables/Config.in
+++ b/openwrt/package/ebtables/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_EBTABLES
-	tristate "ebtables - Ethernet bridge firewall administration utility"
+	prompt "ebtables.......................... Ethernet bridge firewall administration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Ethernet Bridge Firewalling (ebtables)
 	  
 	  http://ebtables.sourceforge.net/
-	  
 
diff --git a/openwrt/package/ether-wake/Config.in b/openwrt/package/ether-wake/Config.in
index 847f0f1be..df3a5fb65 100644
--- a/openwrt/package/ether-wake/Config.in
+++ b/openwrt/package/ether-wake/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_ETHER_WAKE
-	tristate "ether-wake - A Wake-On-LAN (WOL) client"
+	prompt "ether-wake........................ A Wake-On-LAN (WOL) client"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A Wake-On-LAN (WOL) client,
 	  This program sends a magic packet to wake up sleeping networked machines.
 	  
 	  http://www.scyld.com/wakeonlan.html
-	  
+
diff --git a/openwrt/package/expat/Config.in b/openwrt/package/expat/Config.in
index 45f88c05a..0347f3bca 100644
--- a/openwrt/package/expat/Config.in
+++ b/openwrt/package/expat/Config.in
@@ -4,12 +4,12 @@ config BR2_COMPILE_EXPAT
 	depends BR2_PACKAGE_LIBEXPAT
 
 config BR2_PACKAGE_LIBEXPAT
-	tristate "libexpat - a fast, non-validating, stream-oriented XML parsing library"
+	prompt "libexpat.......................... A fast, non-validating, stream-oriented XML parsing library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_EXPAT
 	help
 	  A fast, non-validating, stream-oriented XML parsing library
 	  
 	  http://expat.sourceforge.net/
-	  
 
diff --git a/openwrt/package/ez-ipupdate/Config.in b/openwrt/package/ez-ipupdate/Config.in
index 54016433f..ff385f86c 100644
--- a/openwrt/package/ez-ipupdate/Config.in
+++ b/openwrt/package/ez-ipupdate/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_EZIPUPDATE
-	tristate "ez-ipupdate - Client for most dynamic DNS services"
+	prompt "ez-ipupdate....................... Client for most dynamic DNS services"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A client for many Dynamic DNS services.
 	  
 	  http://ez-ipupdate.com/
-	  
 
diff --git a/openwrt/package/flac/Config.in b/openwrt/package/flac/Config.in
index 73cdd86f5..12405fc39 100644
--- a/openwrt/package/flac/Config.in
+++ b/openwrt/package/flac/Config.in
@@ -2,13 +2,14 @@ config BR2_COMPILE_FLAC
 	bool
 	default n
 	depends BR2_PACKAGE_LIBFLAC
-	
+
 config BR2_PACKAGE_LIBFLAC
-	tristate "libflac - Free Lossless Audio Codec library"
+	prompt "libflac........................... Free Lossless Audio Codec library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_FLAC
 	help
 	  Free Lossless Audio Codec library
 	  
 	  http://flac.sourceforge.net/
-	  
+
diff --git a/openwrt/package/fping/Config.in b/openwrt/package/fping/Config.in
index c12b3020a..c9fbc6ade 100644
--- a/openwrt/package/fping/Config.in
+++ b/openwrt/package/fping/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FPING
-	tristate "fping - Program to ping multiple hosts in parallel"
+	prompt "fping............................. A program to ping multiple hosts in parallel"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  fping is a ping(1) like program which uses the Internet Control Message Protocol
@@ -12,4 +13,4 @@ config BR2_PACKAGE_FPING
 	  limit it will be considered unreachable.
 	  
 	  http://www.fping.com/
-	  
+
diff --git a/openwrt/package/fprobe-ulog/Config.in b/openwrt/package/fprobe-ulog/Config.in
index f86b9f79d..356b4541d 100644
--- a/openwrt/package/fprobe-ulog/Config.in
+++ b/openwrt/package/fprobe-ulog/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FPROBE_ULOG
-	tristate "fprobe-ulog - NetFlow probe (ulog-based)"
+	prompt "fprobe-ulog....................... NetFlow probe (ulog-based)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	help
@@ -7,4 +8,4 @@ config BR2_PACKAGE_FPROBE_ULOG
 	  (iptables ULOG target).
 	  
 	  http://fprobe.sourceforge.net/
-	  
+
diff --git a/openwrt/package/fprobe/Config.in b/openwrt/package/fprobe/Config.in
index bd6e1b2d8..794c7e985 100644
--- a/openwrt/package/fprobe/Config.in
+++ b/openwrt/package/fprobe/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FPROBE
-	tristate "fprobe - NetFlow probe (libpcap-based)"
+	prompt "fprobe............................ NetFlow probe (libpcap-based)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBPTHREAD
@@ -7,4 +8,4 @@ config BR2_PACKAGE_FPROBE
 	  A NetFlow probe using libpcap
 	  
 	  http://fprobe.sourceforge.net/
-	  
+
diff --git a/openwrt/package/freeradius/Config.in b/openwrt/package/freeradius/Config.in
index c29e62c78..fac15befc 100644
--- a/openwrt/package/freeradius/Config.in
+++ b/openwrt/package/freeradius/Config.in
@@ -1,8 +1,8 @@
-menu "freeradius - Flexible RADIUS server"
+menu "freeradius........................ A Flexible RADIUS server implementation"
 
 config BR2_PACKAGE_FREERADIUS
-	prompt "freeradius - Flexible RADIUS server"
-	tristate 
+	prompt "freeradius........................ Flexible RADIUS server"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBLTDL
 	select BR2_PACKAGE_LIBOPENSSL
@@ -19,117 +19,116 @@ config BR2_PACKAGE_FREERADIUS
 	    - libmysqlclient (for MySQL support)
 	    - libopenldap (for LDAP support)
 	    - libpq (for PostgreSQL support)
-	  
 
 config BR2_PACKAGE_FREERADIUS_DEMOCERTS
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-democerts - Demo certificates to test the server"
-	tristate 
+	prompt   "freeradius-democerts............ Demo certificates to test the server"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_CHAP
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-chap - CHAP module"
-	tristate 
+	prompt   "freeradius-mod-chap............. CHAP module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-eap - Base EAP module"
-	tristate 
+	prompt   "freeradius-mod-eap.............. Base EAP module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_GTC
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
-	prompt "...-mod-eap-gtc - EAP/GTC module"
-	tristate 
+	prompt     "freeradius-mod-eap-gtc........ EAP/GTC module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_MD5
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
-	prompt "...-mod-eap-md5 - EAP/MD5 module"
-	tristate 
+	prompt     "freeradius-mod-eap-md5........ EAP/MD5 module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_MSCHAPV2
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
-	prompt "...-mod-eap-mschapv2 - EAP/MS-CHAPv2 module"
-	tristate 
+	prompt     "freeradius-mod-eap-mschapv2... EAP/MS-CHAPv2 module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_PEAP
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
-	prompt "...-mod-eap-peap - EAP/PEAP module"
-	tristate 
+	prompt     "freeradius-mod-eap-peap....... EAP/PEAP module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_TLS
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
-	prompt "...-mod-eap-tls - EAP/TLS module"
-	tristate 
+	prompt     "freeradius-mod-eap-tls........ EAP/TLS module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP
 
 config BR2_PACKAGE_FREERADIUS_MOD_EAP_TTLS
-	depends BR2_PACKAGE_FREERADIUS_MOD_EAP_TLS
-	prompt "...-mod-eap-ttls - EAP/TTLS module"
-	tristate 
+	prompt       "freeradius-mod-eap-ttls..... EAP/TTLS module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_EAP_TLS
 
 config BR2_PACKAGE_FREERADIUS_MOD_FILES
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-files - Module using local files for authorization"
-	tristate 
+	prompt   "freeradius-mod-files............ Module using local files for authorization"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_LDAP
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-ldap - LDAP module"
-	tristate 
+	prompt   "freeradius-mod-ldap............. LDAP module"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENLDAP
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_MSCHAP
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-mschap - MS-CHAP and MS-CHAPv2 module"
-	tristate 
+	prompt   "freeradius-mod-mschap........... MS-CHAP and MS-CHAPv2 module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_PAP
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-pap - PAP module"
-	tristate 
+	prompt   "freeradius-mod-pap.............. PAP module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQL
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-mod-sql - Base SQL module"
-	tristate 
+	prompt   "freeradius-mod-sql.............. Base SQL module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
-	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
-	prompt "...-mod-sql-mysql - MySQL module"
-	tristate 
+	prompt     "freeradius-mod-sql-mysql...... MySQL module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQL_PGSQL
-	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
-	prompt "...-mod-sql-pgsql - PostgreSQL module"
-	tristate 
+	prompt     "freeradius-mod-sql-pgsql...... PostgreSQL module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
 	select BR2_PACKAGE_LIBPQ
 
 config BR2_PACKAGE_FREERADIUS_MOD_SQLCOUNTER
-	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
-	prompt "...-mod-sqlcounter - Generic SQL Counter module"
-	tristate 
+	prompt     "freeradius-mod-sqlcounter..... Generic SQL Counter module"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS_MOD_SQL
 
 config BR2_PACKAGE_FREERADIUS_UTILS
-	depends BR2_PACKAGE_FREERADIUS
-	prompt "...-utils - Misc. client utilities"
-	tristate 
+	prompt   "freeradius-utils................ Misc. client utilities"
+	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_FREERADIUS
 
 endmenu
diff --git a/openwrt/package/freetype/Config.in b/openwrt/package/freetype/Config.in
index 1bed3cf45..8a12d532c 100644
--- a/openwrt/package/freetype/Config.in
+++ b/openwrt/package/freetype/Config.in
@@ -1,13 +1,13 @@
-config BR2_PACKAGE_FREETYPE
+config BR2_COMPILE_FREETYPE
 	bool
 	default n
 	depends BR2_PACKAGE_LIBFREETYPE
 
 config BR2_PACKAGE_LIBFREETYPE
-	tristate "libfreetype - A free, high-quality and portable font engine"
+	tristate "libfreetype....................... A free, high-quality and portable font engine"
 #	default m if CONFIG_DEVEL
 	default n
-	select BR2_PACKAGE_FREETYPE
+	select BR2_COMPILE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
 	  The FreeType project is a team of volunteers who develop free,
@@ -23,4 +23,4 @@ config BR2_PACKAGE_LIBFREETYPE
 	   * High portability & performance
 	  
 	  http://www.freetype.org/
-	  
+
diff --git a/openwrt/package/frickin/Config.in b/openwrt/package/frickin/Config.in
index cd560d2ac..b118a111a 100644
--- a/openwrt/package/frickin/Config.in
+++ b/openwrt/package/frickin/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FRICKIN
-	tristate "frickin - PPTP (Point-to-Point Tunneling Protocol) proxy"
+	prompt "frickin........................... PPTP (Point-to-Point Tunneling Protocol) proxy"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) 
@@ -7,4 +8,4 @@ config BR2_PACKAGE_FRICKIN
 	  Translation (NAT).
 	  
 	  http://frickin.sourceforge.net/
-	  
+
diff --git a/openwrt/package/fuse/Config.in b/openwrt/package/fuse/Config.in
index 5159140e3..d24598619 100644
--- a/openwrt/package/fuse/Config.in
+++ b/openwrt/package/fuse/Config.in
@@ -1,13 +1,13 @@
-config BR2_PACKAGE_FUSE
+config BR2_COMPILE_FUSE
 	bool
 	default n
 	depends BR2_PACKAGE_LIBFUSE
 
-
 config BR2_PACKAGE_LIBFUSE
-	prompt "libfuse - FUSE library"
+	prompt "libfuse........................... FUSE library"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_FUSE
 	select BR2_PACKAGE_KMOD_FUSE
 	select BR2_PACKAGE_LIBPTHREAD
 	help
@@ -24,16 +24,14 @@ config BR2_PACKAGE_LIBFUSE
 	   * Runs on Linux kernels 2.4.X and 2.6.X
 	   * Has proven very stable over time
 	  
-	  
 	  http://fuse.sourceforge.net/
 	  
 	  This package contains the fuse shared library, needed by other programs.
 	  
 	  Depends: libpthread
-	  
 
 config BR2_PACKAGE_FUSE_UTILS
-	prompt "fuse-utils - FUSE utilities"
+	prompt   "fuse-utils...................... FUSE utilities"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBFUSE
@@ -52,8 +50,7 @@ config BR2_PACKAGE_FUSE_UTILS
 	   * Runs on Linux kernels 2.4.X and 2.6.X
 	   * Has proven very stable over time
 	  
-	  
 	  http://fuse.sourceforge.net/
 	  
 	  This package contains the fusermount userland utility.
-	  
+
diff --git a/openwrt/package/gdbserver/Config.in b/openwrt/package/gdbserver/Config.in
index 15d8f2069..df74ff614 100644
--- a/openwrt/package/gdbserver/Config.in
+++ b/openwrt/package/gdbserver/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GDBSERVER
-	tristate "gdbserver - Remote Server for the GNU Debugger"
+	prompt "gdbserver......................... Remote Server for the GNU Debugger"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 GDBSERVER is a program that allows you to run GDB on a different machine
-	 than the one which is running the program being debugged.
-	 
+	  GDBSERVER is a program that allows you to run GDB on a different machine
+	  than the one which is running the program being debugged.
 
diff --git a/openwrt/package/glib/Config.in b/openwrt/package/glib/Config.in
index d5859f58a..1ec23b9ef 100644
--- a/openwrt/package/glib/Config.in
+++ b/openwrt/package/glib/Config.in
@@ -1,6 +1,12 @@
+config BR2_COMPILE_GLIB
+	bool
+	depends BR2_PACKAGE_GLIB1
+
 config BR2_PACKAGE_GLIB1
-	tristate "glib 1.2 - The GLib library of C routines"
+	prompt "glib1............................. The GLib library of C routines (v1.2)"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_GLIB
 	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  GLib is a library containing many useful C routines for things such
@@ -9,7 +15,4 @@ config BR2_PACKAGE_GLIB1
 	  http://www.gtk.org/
 	  
 	  Depends: libpthread
-	  
-config BR2_PACKAGE_GLIB
-	tristate
-	default BR2_PACKAGE_GLIB1
+
diff --git a/openwrt/package/gmediaserver/Config.in b/openwrt/package/gmediaserver/Config.in
index b93b12600..e9b6ed504 100644
--- a/openwrt/package/gmediaserver/Config.in
+++ b/openwrt/package/gmediaserver/Config.in
@@ -1,14 +1,13 @@
 config BR2_PACKAGE_GMEDIASERVER
-	prompt "gmediaserver - An UPnP music media server"
-	tristate 
+	prompt "gmediaserver...................... An UPnP music media server"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ID3LIB
 	select BR2_PACKAGE_LIBUPNP
 	help
-	 An UPnP music media server.
-	 
-	 http://www.nongnu.org/gmediaserver/
-	 
-	 Depends: id3lib, libupnp
-	 
+	  An UPnP music media server.
+	  
+	  http://www.nongnu.org/gmediaserver/
+	  
+	  Depends: id3lib, libupnp
 
diff --git a/openwrt/package/gmp/Config.in b/openwrt/package/gmp/Config.in
index 28296318b..f00ee9226 100644
--- a/openwrt/package/gmp/Config.in
+++ b/openwrt/package/gmp/Config.in
@@ -1,12 +1,15 @@
+config BR2_COMPILE_GMP
+	bool
+	default n
+	depends BR2_PACKAGE_LIBGMP
+
 config BR2_PACKAGE_LIBGMP
-	tristate "libgmp - GNU multiprecision arithmetic library"
+	prompt "libgmp............................ GNU multiprecision arithmetic library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_GMP
 	help
 	  GNU multiprecision arithmetic library
 	  
 	  http://www.swox.com/gmp/
-	  
 
-config BR2_PACKAGE_GMP
-	tristate
-	default BR2_PACKAGE_LIBGMP
diff --git a/openwrt/package/gnutls/Config.in b/openwrt/package/gnutls/Config.in
index 5283101de..291084f1a 100644
--- a/openwrt/package/gnutls/Config.in
+++ b/openwrt/package/gnutls/Config.in
@@ -4,96 +4,96 @@ config BR2_COMPILE_GNUTLS
 	depends BR2_PACKAGE_LIBGNUTLS
 
 config BR2_PACKAGE_LIBGNUTLS
-	tristate "libgnutls - The GNU TLS library"
+	prompt "libgnutls......................... The GNU TLS library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT
 	help
-	 GnuTLS is a project that aims to develop a library which provides a 
-	 secure layer, over a reliable transport layer. Currently the GnuTLS 
-	 library implements the proposed standards by the IETF's TLS working 
-	 group.
-	 
-	 Quoting from RFC2246 - the TLS 1.0 protocol specification:
-	 
-	 "The TLS protocol provides communications privacy over the Internet.
-	  The protocol allows client/server applications to communicate in a 
-	  way that is designed to prevent eavesdropping, tampering, or message 
-	  forgery."
-	 
-	 Features
-	 
-	   * Support for TLS 1.1 and SSL 3.0 protocols
-	   * Support for TLS extensions
-	   * Support for authentication using the SRP protocol
-	   * Support for authentication using both X.509 certificates
-	   * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	   * Supports all the strong encryption algorithms
-	 
-	 http://www.gnu.org/software/gnutls/
-	 
-	 This packages contains the GnuTLS shared libraries, needed by other programs.
-	 
+	  GnuTLS is a project that aims to develop a library which provides a 
+	  secure layer, over a reliable transport layer. Currently the GnuTLS 
+	  library implements the proposed standards by the IETF's TLS working 
+	  group.
+	  
+	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
+	  
+	  "The TLS protocol provides communications privacy over the Internet.
+	   The protocol allows client/server applications to communicate in a 
+	   way that is designed to prevent eavesdropping, tampering, or message 
+	   forgery."
+	  
+	  Features
+	  
+	    * Support for TLS 1.1 and SSL 3.0 protocols
+	    * Support for TLS extensions
+	    * Support for authentication using the SRP protocol
+	    * Support for authentication using both X.509 certificates
+	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
+	    * Supports all the strong encryption algorithms
+	  
+	  http://www.gnu.org/software/gnutls/
+	  
+	  This packages contains the GnuTLS shared libraries, needed by other programs.
 
 config BR2_PACKAGE_GNUTLS_UTILS
-	tristate "gnutls-utils - The GNU TLS utilities"
+	prompt   "gnutls-utils.................... The GNU TLS utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBGNUTLS
 	help
-	 GnuTLS is a project that aims to develop a library which provides a 
-	 secure layer, over a reliable transport layer. Currently the GnuTLS 
-	 library implements the proposed standards by the IETF's TLS working 
-	 group.
-	 
-	 Quoting from RFC2246 - the TLS 1.0 protocol specification:
-	 
-	 "The TLS protocol provides communications privacy over the Internet.
-	  The protocol allows client/server applications to communicate in a 
-	  way that is designed to prevent eavesdropping, tampering, or message 
-	  forgery."
-	 
-	 Features
-	 
-	   * Support for TLS 1.1 and SSL 3.0 protocols
-	   * Support for TLS extensions
-	   * Support for authentication using the SRP protocol
-	   * Support for authentication using both X.509 certificates
-	   * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	   * Supports all the strong encryption algorithms
-	 
-	 http://www.gnu.org/software/gnutls/
-	 
-	 This packages contains some GnuTLS utilities.
-	 
+	  GnuTLS is a project that aims to develop a library which provides a 
+	  secure layer, over a reliable transport layer. Currently the GnuTLS 
+	  library implements the proposed standards by the IETF's TLS working 
+	  group.
+	  
+	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
+	  
+	  "The TLS protocol provides communications privacy over the Internet.
+	   The protocol allows client/server applications to communicate in a 
+	   way that is designed to prevent eavesdropping, tampering, or message 
+	   forgery."
+	  
+	  Features
+	  
+	    * Support for TLS 1.1 and SSL 3.0 protocols
+	    * Support for TLS extensions
+	    * Support for authentication using the SRP protocol
+	    * Support for authentication using both X.509 certificates
+	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
+	    * Supports all the strong encryption algorithms
+	  
+	  http://www.gnu.org/software/gnutls/
+	  
+	  This packages contains some GnuTLS utilities.
 
 config BR2_PACKAGE_LIBGNUTLS_OPENSSL
-	tristate "libgnutls-openssl - The GNU TLS OpenSSL compatibility layer library"
+	prompt   "libgnutls-openssl............... The GNU TLS OpenSSL compatibility layer library"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBGNUTLS
 	help
-	 GnuTLS is a project that aims to develop a library which provides a 
-	 secure layer, over a reliable transport layer. Currently the GnuTLS 
-	 library implements the proposed standards by the IETF's TLS working 
-	 group.
-	 
-	 Quoting from RFC2246 - the TLS 1.0 protocol specification:
-	 
-	 "The TLS protocol provides communications privacy over the Internet.
-	  The protocol allows client/server applications to communicate in a 
-	  way that is designed to prevent eavesdropping, tampering, or message 
-	  forgery."
-	 
-	 Features
-	 
-	   * Support for TLS 1.1 and SSL 3.0 protocols
-	   * Support for TLS extensions
-	   * Support for authentication using the SRP protocol
-	   * Support for authentication using both X.509 certificates
-	   * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	   * Supports all the strong encryption algorithms
-	 
-	 http://www.gnu.org/software/gnutls/
-	 
-	 This packages contains the GnuTLS OpenSSL compatibility layer shared library.
-	 
+	  GnuTLS is a project that aims to develop a library which provides a 
+	  secure layer, over a reliable transport layer. Currently the GnuTLS 
+	  library implements the proposed standards by the IETF's TLS working 
+	  group.
+	  
+	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
+	  
+	  "The TLS protocol provides communications privacy over the Internet.
+	   The protocol allows client/server applications to communicate in a 
+	   way that is designed to prevent eavesdropping, tampering, or message 
+	   forgery."
+	  
+	  Features
+	  
+	    * Support for TLS 1.1 and SSL 3.0 protocols
+	    * Support for TLS extensions
+	    * Support for authentication using the SRP protocol
+	    * Support for authentication using both X.509 certificates
+	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
+	    * Supports all the strong encryption algorithms
+	  
+	  http://www.gnu.org/software/gnutls/
+	  
+	  This packages contains the GnuTLS OpenSSL compatibility layer shared library.
 
diff --git a/openwrt/package/gpsd/Config.in b/openwrt/package/gpsd/Config.in
index 6cf31d51a..7b5791917 100644
--- a/openwrt/package/gpsd/Config.in
+++ b/openwrt/package/gpsd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GPSD
-	tristate "gpsd - An interface daemon for GPS receivers"
+	prompt "gpsd.............................. An interface daemon for GPS receivers"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_UCLIBCXX
@@ -14,4 +15,4 @@ config BR2_PACKAGE_GPSD
 	  discovers the correct port speed and protocol for it.
 	  
 	  http://gpsd.berlios.de/
-	  
+
diff --git a/openwrt/package/haserl/Config.in b/openwrt/package/haserl/Config.in
index b3e029add..a766be73f 100644
--- a/openwrt/package/haserl/Config.in
+++ b/openwrt/package/haserl/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_HASERL
-	tristate "haserl - CGI wrapper to embed shell scripts in HTML documents"
+	prompt "haserl............................ A CGI wrapper to embed shell scripts in HTML documents"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A CGI wrapper to embed shell scripts in HTML documents.
 	  
 	  http://haserl.sourceforge.net/
-	  
 
diff --git a/openwrt/package/hostapd/Config.in b/openwrt/package/hostapd/Config.in
index db9af0f1c..db72ff02b 100644
--- a/openwrt/package/hostapd/Config.in
+++ b/openwrt/package/hostapd/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_HOSTAPD
-	tristate "hostapd - IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
+	prompt "hostapd........................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_MADWIFI
-	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBOPENSSL
 	help
 	  hostapd is a user space daemon for access point and 
 	  authentication servers. It implements IEEE 802.11 access point 
@@ -10,5 +11,4 @@ config BR2_PACKAGE_HOSTAPD
 	  client, EAP server, and RADIUS authentication server.
 	  
 	  http://hostap.epitest.fi/hostapd/
-	  
 
diff --git a/openwrt/package/howl/Config.in b/openwrt/package/howl/Config.in
index c4623ec60..a55bbf35f 100644
--- a/openwrt/package/howl/Config.in
+++ b/openwrt/package/howl/Config.in
@@ -1,46 +1,62 @@
-menu "howl - Zeroconf networking implementation"
+menu "howl.............................. A Zeroconf networking implementation"
 
-config BR2_PACKAGE_HOWL
+config BR2_COMPILE_HOWL
 	bool
 	default n
 	depends BR2_PACKAGE_LIBHOWL
 
 config BR2_PACKAGE_LIBHOWL
-	prompt "libhowl - howl library"
+	prompt "libhowl........................... The howl library"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_HOWL
+	select BR2_COMPILE_HOWL
 	help
-	  
 	  A cross-platform implementation of Zeroconf networking.
 	  
 	  http://www.porchdogsoft.com/products/howl/
 	  
 	  This package contains shared libraries, needed by other programs.
-	  
 
 config BR2_PACKAGE_HOWL_UTILS
-	depends BR2_PACKAGE_LIBHOWL
-	prompt "howl-utils - howl client utilities"
+	prompt   "howl-utils...................... The howl client utilities"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
+
+comment "Daemons ---"
 
 config BR2_PACKAGE_AUTOIPD
-	depends BR2_PACKAGE_LIBHOWL
-	prompt "autoipd - an IPv4 Link-Local address self-assigner daemon"
+	prompt "autoipd........................... An IPv4 Link-Local address self-assigner daemon"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
 
 config BR2_PACKAGE_MDNSRESPONDER
-	depends BR2_PACKAGE_LIBHOWL
-	prompt "mdnsresponder - an mDNS (Multicast DNS) service responder daemon"
+	prompt "mdnsresponder..................... An mDNS (Multicast DNS) service responder daemon"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
 
 config BR2_PACKAGE_NIFD
-	depends BR2_PACKAGE_LIBHOWL
-	prompt "nifd - a network interface monitor daemon"
+	prompt "nifd.............................. A network interface monitor daemon"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBHOWL
+	help
+	  A cross-platform implementation of Zeroconf networking.
+	  
+	  http://www.porchdogsoft.com/products/howl/
 
 endmenu
diff --git a/openwrt/package/htpdate/Config.in b/openwrt/package/htpdate/Config.in
index 7a157b7fa..89f19d297 100644
--- a/openwrt/package/htpdate/Config.in
+++ b/openwrt/package/htpdate/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_HTPDATE
-	tristate "htpdate - HTP (Hypertext Time Protocol) implementation"
+	prompt "htpdate........................... HTP (Hypertext Time Protocol) implementation"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  An HTP (Hypertext Time Protocol) implementation
 	  
 	  http://www.clevervest.com/htp/
-	  
 
diff --git a/openwrt/package/icecast/Config.in b/openwrt/package/icecast/Config.in
index 5252c8c8d..90c75c7cf 100644
--- a/openwrt/package/icecast/Config.in
+++ b/openwrt/package/icecast/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ICECAST
-	tristate "icecast - A streaming media server for Ogg/Vorbis and MP3 audio streams"
+	prompt "icecast........................... A streaming media server for Ogg/Vorbis and MP3 audio streams"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBVORBISIDEC
@@ -20,5 +21,4 @@ config BR2_PACKAGE_ICECAST
 	   * libvorbisidec
 	   * libxml2
 	   * libxslt
-	  
 
diff --git a/openwrt/package/id3lib/Config.in b/openwrt/package/id3lib/Config.in
index 243a5443d..6bca99aa6 100644
--- a/openwrt/package/id3lib/Config.in
+++ b/openwrt/package/id3lib/Config.in
@@ -1,14 +1,13 @@
 config BR2_PACKAGE_ID3LIB
-	prompt "id3lib - An ID3v1/ID3v2 tagging library"
+	prompt "id3lib............................ An ID3v1/ID3v2 tagging library"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_UCLIBCXX
 	select BR2_PACKAGE_ZLIB
 	help
-	 An ID3v1/ID3v2 tagging library.
-	 
-	 http://www.id3lib.org/
-	 
-	 Depends: uClibc++, zlib
-	 
+	  An ID3v1/ID3v2 tagging library.
+	  
+	  http://www.id3lib.org/
+	  
+	  Depends: uClibc++, zlib
 
diff --git a/openwrt/package/iperf/Config.in b/openwrt/package/iperf/Config.in
index 6a02f2fdc..2e939ad19 100644
--- a/openwrt/package/iperf/Config.in
+++ b/openwrt/package/iperf/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_IPERF
-	tristate "iperf - Internet Protocol bandwidth measuring tool"
+	prompt "iperf............................. Internet Protocol bandwidth measuring tool"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Iperf is a modern alternative for measuring TCP and UDP bandwidth 
@@ -7,5 +8,4 @@ config BR2_PACKAGE_IPERF
 	  characteristics.
 	  
 	  http://dast.nlanr.net/Projects/Iperf/
-	  
 
diff --git a/openwrt/package/ipkg/Config.in b/openwrt/package/ipkg/Config.in
index 1bbb75c6c..a8bdef97c 100644
--- a/openwrt/package/ipkg/Config.in
+++ b/openwrt/package/ipkg/Config.in
@@ -1,17 +1,18 @@
 config BR2_PACKAGE_IPKG
-	tristate "ipkg - itsy package management system"
-	depends ! BUSYBOX_CONFIG_IPKG
-	default y
+	prompt "ipkg.............................. The itsy package management system"
+	tristate
+	default m if BUSYBOX_CONFIG_IPKG
+	default y if ! BUSYBOX_CONFIG_IPKG
 	help
-	 Lightweight package management system
-	 ipkg is the Itsy Package Management System, for handling
-	 installation and removal of packages on a system. It can
-	 recursively follow dependencies and download all packages
-	 necessary to install a particular package.
-	 
-	 ipkg knows how to install both .ipk and .deb packages.
-
-	 ipkg is intended to serve the same functions (and more) for
-	 Familiar that dpkg and apt serve for Debian, (while taking
-	 up much less space).
+	  Lightweight package management system
+	  ipkg is the Itsy Package Management System, for handling
+	  installation and removal of packages on a system. It can
+	  recursively follow dependencies and download all packages
+	  necessary to install a particular package.
+	  
+	  ipkg knows how to install both .ipk and .deb packages.
+	  
+	  ipkg is intended to serve the same functions (and more) for
+	  Familiar that dpkg and apt serve for Debian, (while taking
+	  up much less space).
 
diff --git a/openwrt/package/iproute2/Config.in b/openwrt/package/iproute2/Config.in
index b123f5ca6..85fa18421 100644
--- a/openwrt/package/iproute2/Config.in
+++ b/openwrt/package/iproute2/Config.in
@@ -1,17 +1,21 @@
-config BR2_PACKAGE_IPROUTE2
-	tristate
-	depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC
+menu "iproute2.......................... A collection of utilites for controlling TCP/IP networking and Traffic Control"
+
+config BR2_COMPILE_IPROUTE2
+	bool
 	default n
+	depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC
 
-config BR2_PACKAGE_IPROUTE2_IP
-	tristate "iproute2 routing control (ip)"
+config BR2_PACKAGE_IP
+	prompt   "ip.............................. A routing control utility"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_IPROUTE2
+	select BR2_COMPILE_IPROUTE2
 
-config BR2_PACKAGE_IPROUTE2_TC
-	tristate "iproute2 traffic control (tc)"
+config BR2_PACKAGE_TC
+	prompt   "tc.............................. A traffic control utility"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_IPROUTE2
+	select BR2_COMPILE_IPROUTE2
 	select BR2_PACKAGE_KMOD_SCHED
 
-	
+endmenu
diff --git a/openwrt/package/ipset/Config.in b/openwrt/package/ipset/Config.in
index c1d307206..293292cfe 100644
--- a/openwrt/package/ipset/Config.in
+++ b/openwrt/package/ipset/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_IPSET
-	tristate "ipset - Netfilter ip sets administration utility"
+	prompt "ipset............................. Netfilter ip sets administration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Netfilter ip sets administration utility
 	  
 	  http://ipset.netfilter.org/
-	  
 
diff --git a/openwrt/package/iptables/Config.in b/openwrt/package/iptables/Config.in
index f55b29674..9529cd5cc 100644
--- a/openwrt/package/iptables/Config.in
+++ b/openwrt/package/iptables/Config.in
@@ -1,32 +1,49 @@
+menu "iptables.......................... IPv4 / IPv6 firewall administration"
+
+config BR2_COMPILE_IPTABLES
+	bool
+	default n
+	depends BR2_PACKAGE_IPTABLES || BR2_PACKAGE_IP6TABLES
+
 config BR2_PACKAGE_IPTABLES
-	tristate "iptables - IPv4 firewall administration tool"
+	prompt "iptables.......................... IPv4 firewall administration tool"
+	tristate
 	default y
+	select BR2_COMPILE_IPTABLES
 	help
-	  Linux kernel (2.4+) firewall, NAT, and packet mangling tools.
+	  IPv4 firewall, NAT, and packet mangling tools.
 	  
 	  http://www.iptables.org/
-	  
 
 config BR2_PACKAGE_IPTABLES_UTILS
-	tristate "iptables - Save and restore utilities"
+	prompt   "iptables-utils.................. Save and restore utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  iptables-save and iptables-restore
+	  
+	  http://www.iptables.org/
 
 config BR2_PACKAGE_IPTABLES_EXTRA
-	tristate "extra modules - Extra modules not found elsewhere"
+	prompt   "iptables-extra.................. Extra modules not found elsewhere"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  Extra modules for iptables (kernel and user space)
+	  
+	  http://www.iptables.org/
 
 config BR2_PACKAGE_IP6TABLES
-	tristate "ip6tables - IPv6 firewall administration tool"
+	prompt "ip6tables......................... IPv6 firewall administration tool"
+	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
+	select BR2_COMPILE_IPTABLES
 	select BR2_PACKAGE_KMOD_IPV6
 	help
-	  IPv6 firewalling
-
+	  IPv6 firewall, NAT, and packet mangling tools.
+	  
+	  http://www.iptables.org/
 
+endmenu
diff --git a/openwrt/package/iptraf/Config.in b/openwrt/package/iptraf/Config.in
index e814503cd..3f15165d0 100644
--- a/openwrt/package/iptraf/Config.in
+++ b/openwrt/package/iptraf/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_IPTRAF
-	tristate "iptraf - A console-based network monitoring program"
+	prompt "iptraf............................ A console-based network monitoring program"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  IPTraf is a console-based network statistics utility for Linux. It gathers 
@@ -8,5 +9,4 @@ config BR2_PACKAGE_IPTRAF
 	  and LAN station packet and byte counts.
 	  
 	  http://iptraf.seul.org/
-	  
 
diff --git a/openwrt/package/irssi/Config.in b/openwrt/package/irssi/Config.in
index 226856789..8a150f23a 100644
--- a/openwrt/package/irssi/Config.in
+++ b/openwrt/package/irssi/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_IRSSI
-	tristate "irssi - console irc client"
+	prompt "irssi............................. console irc client"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_GLIB1
 	select BR2_PACKAGE_LIBNCURSES
-
 	help
-	IRC client for the text console
-	 
-	http://irssi.org
+	  IRC client for the text console
 	  
+	  http://irssi.org
+
diff --git a/openwrt/package/jpeg/Config.in b/openwrt/package/jpeg/Config.in
index 48a01ba47..f49318335 100644
--- a/openwrt/package/jpeg/Config.in
+++ b/openwrt/package/jpeg/Config.in
@@ -4,12 +4,12 @@ config BR2_COMPILE_JPEG
 	depends BR2_PACKAGE_LIBJPEG
 
 config BR2_PACKAGE_LIBJPEG
-	tristate "libjpeg - The Independent JPEG Group's JPEG runtime library"
+	prompt "libjpeg........................... The Independent JPEG Group's JPEG runtime library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_JPEG
 	help
 	  The Independent JPEG Group's JPEG runtime library.
 	  
 	  http://www.ijg.org/
-	  
 
diff --git a/openwrt/package/kismet/Config.in b/openwrt/package/kismet/Config.in
index d3708d78e..6a5fbebd7 100644
--- a/openwrt/package/kismet/Config.in
+++ b/openwrt/package/kismet/Config.in
@@ -1,15 +1,15 @@
-menu "kismet - an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+#menu "kismet............................ An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 
-config BR2_PACKAGE_KISMET
-	tristate
+config BR2_COMPILE_KISMET
+	bool
 	default n
 	depends BR2_PACKAGE_KISMET_CLIENT || BR2_PACKAGE_KISMET_DRONE || BR2_PACKAGE_KISMET_SERVER
 
 config BR2_PACKAGE_KISMET_CLIENT
-	prompt "kismet-client - the Kismet client"
+	prompt "kismet-client..................... The Kismet client"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_KISMET
+	select BR2_COMPILE_KISMET
 	select BR2_PACKAGE_LIBNCURSES
 	select BR2_PACKAGE_UCLIBCXX
 	help
@@ -24,13 +24,12 @@ config BR2_PACKAGE_KISMET_CLIENT
 	    - libncurses
 	    - libpcap
 	    - uClibc++
-	  
 
 config BR2_PACKAGE_KISMET_DRONE
-	prompt "kismet-drone - the Kismet drone"
+	prompt "kismet-drone...................... The Kismet drone"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_KISMET
+	select BR2_COMPILE_KISMET
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_UCLIBCXX
 	help
@@ -44,13 +43,12 @@ config BR2_PACKAGE_KISMET_DRONE
 	  Depends:
 	    - libpcap
 	    - uClibc++
-	  
 
 config BR2_PACKAGE_KISMET_SERVER
-	prompt "kismet-server - the Kismet server"
+	prompt "kismet-server..................... The Kismet server"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_KISMET
+	select BR2_COMPILE_KISMET
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_UCLIBCXX
 	help
@@ -64,6 +62,5 @@ config BR2_PACKAGE_KISMET_SERVER
 	  Depends:
 	    - libpcap
 	    - uClibc++
-	  
 
-endmenu
+#endmenu
diff --git a/openwrt/package/l2tpd/Config.in b/openwrt/package/l2tpd/Config.in
index 297bbcae0..47d83ed74 100644
--- a/openwrt/package/l2tpd/Config.in
+++ b/openwrt/package/l2tpd/Config.in
@@ -1,9 +1,13 @@
 config BR2_PACKAGE_L2TPD
-	tristate "l2tpd - L2TP (Layer 2 Tunneling Protocol) daemon"
+	prompt "l2tpd............................. An L2TP (Layer 2 Tunneling Protocol) daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 A layer 2 tunneling protocol implementation.
-	 l2tpd is the open source implementation of the L2TP tunneling
-	 protocol (RFC2661). It does implement both LAC and LNS role 
-	 in a L2TP networking architecture. The main goal of this protocol is 
-	 to tunnel PPP frame trough an ip network. 
+	  A layer 2 tunneling protocol implementation.
+	  l2tpd is the open source implementation of the L2TP tunneling
+	  protocol (RFC2661). It does implement both LAC and LNS role 
+	  in a L2TP networking architecture. The main goal of this protocol is 
+	  to tunnel PPP frame trough an ip network. 
+	  
+	  http://l2tpd.sourceforge.net/
+
diff --git a/openwrt/package/lcd4linux/Config.in b/openwrt/package/lcd4linux/Config.in
index c08212c32..9dbb1dad6 100644
--- a/openwrt/package/lcd4linux/Config.in
+++ b/openwrt/package/lcd4linux/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LCD4LINUX
-	tristate "lcd4linux - Program to access an external LCD"
+	prompt "lcd4linux......................... Program to access an external LCD"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
 	  LCD4Linux
 	  
 	  https://ssl.bulix.org/projects/lcd4linux/wiki/Howto
-	  
 
diff --git a/openwrt/package/less/Config.in b/openwrt/package/less/Config.in
index 80de80f2a..2581bd923 100644
--- a/openwrt/package/less/Config.in
+++ b/openwrt/package/less/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_LESS
-	tristate "less - a text file viewer."
+	prompt "less.............................. A text file viewer."
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
 	  less - less is a pager. A pager usually displays text files.
-
-          http://www.greenwoodsoftware.com/less/
 	  
+	  http://www.greenwoodsoftware.com/less/
+
diff --git a/openwrt/package/libamsel/Config.in b/openwrt/package/libamsel/Config.in
index fefaebb2a..60738b4ef 100644
--- a/openwrt/package/libamsel/Config.in
+++ b/openwrt/package/libamsel/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_LIBAMSEL
-        tristate "libamsel - amwall library"
-        default m if CONFIG_DEVEL
-        help
-          A library for amwall configuration files
-
-          http://amselinux.de/
+	prompt "libamsel.......................... The amwall library"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	  A library for amwall configuration files
+	  
+	  http://amselinux.de/
 
diff --git a/openwrt/package/libao/Config.in b/openwrt/package/libao/Config.in
index 8c10e4806..67403aece 100644
--- a/openwrt/package/libao/Config.in
+++ b/openwrt/package/libao/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LIBAO
-	tristate "libao - A cross platform audio library"
+	prompt "libao............................. A cross platform audio library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Libao is a cross-platform audio library that allows programs to 
 	  output audio using a simple API on a wide variety of platforms. 
 	  
 	  http://www.xiph.org/ao/
-	  
 
diff --git a/openwrt/package/libart/Config.in b/openwrt/package/libart/Config.in
index 99a6a3f65..562e77f68 100644
--- a/openwrt/package/libart/Config.in
+++ b/openwrt/package/libart/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBART
-	tristate "libart - An high-performance 2D graphics library"
+	prompt "libart............................ An high-performance 2D graphics library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	help
@@ -10,4 +11,4 @@ config BR2_PACKAGE_LIBART
 	  especially suitable for embedded applications.
 	  
 	  http://www.levien.com/libart/
-	  
+
diff --git a/openwrt/package/libdaemon/Config.in b/openwrt/package/libdaemon/Config.in
index 154abea8c..3cda2d072 100644
--- a/openwrt/package/libdaemon/Config.in
+++ b/openwrt/package/libdaemon/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBDAEMON
-	tristate "libdaemon - A lightweight C library that eases the writing of UNIX daemons"
+	prompt "libdaemon......................... A lightweight C library that eases the writing of UNIX daemons"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  libdaemon is a lightweight C library that eases the writing of UNIX daemons. 
@@ -14,6 +15,5 @@ config BR2_PACKAGE_LIBDAEMON
 	  APIs like these are used in most daemon software available. It is not that 
 	  simple to get it done right and code duplication is not a goal.
 	  
-	  
 	  http://0pointer.de/lennart/projects/libdaemon/
-	  
+
diff --git a/openwrt/package/libdb/Config.in b/openwrt/package/libdb/Config.in
index 5b0f51b07..2a7b77125 100644
--- a/openwrt/package/libdb/Config.in
+++ b/openwrt/package/libdb/Config.in
@@ -1,7 +1,15 @@
+config BR2_COMPILE_DB
+	bool
+	default n
+	depends BR2_PACKAGE_LIBDB
+
 config BR2_PACKAGE_LIBDB
-	tristate "libdb - Berkeley DB"
+	prompt "libdb............................. Berkeley DB"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_DB
 	help
-	 disk file format database which stores key/data-pairs in single files.  
+	  disk file format database which stores key/data-pairs in single files.  
 	  
 	  http://www.sleepycat.com/products/db.shtml
+
diff --git a/openwrt/package/libdnet/Config.in b/openwrt/package/libdnet/Config.in
index 6a719b10d..de7c3548d 100644
--- a/openwrt/package/libdnet/Config.in
+++ b/openwrt/package/libdnet/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBDNET
-	tristate "libdnet - Low-level network library"
+	prompt "libdnet........................... Low-level network library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  simplified, portable interface to several low-level networking routines
 	  
 	  http://sourceforge.net/projects/libdnet/
+
diff --git a/openwrt/package/libelf/Config.in b/openwrt/package/libelf/Config.in
index d5a25711a..915632ebf 100644
--- a/openwrt/package/libelf/Config.in
+++ b/openwrt/package/libelf/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_LIBELF
-	tristate "libelf - ELF object file access library"
+	prompt "libelf............................ ELF object file access library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  This is the public release of libelf-0.8.5, a free ELF object
 	  file access library.
 	  
 	  http://www.stud.uni-hannover.de/~michael/software/
-	  
+
diff --git a/openwrt/package/libevent/Config.in b/openwrt/package/libevent/Config.in
index d406b125c..6f1eafcc3 100644
--- a/openwrt/package/libevent/Config.in
+++ b/openwrt/package/libevent/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBEVENT
-	tristate "libevent - Event notification library for event-driven network servers"
+	prompt "libevent.......................... Event notification library for event-driven network servers"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The libevent API provides a mechanism to execute a callback function 
@@ -13,4 +14,4 @@ config BR2_PACKAGE_LIBEVENT
 	  the event loop.
 	  
 	  http://www.monkey.org/~provos/libevent/
-	  
+
diff --git a/openwrt/package/libffi-sable/Config.in b/openwrt/package/libffi-sable/Config.in
index ae6525b65..18db3def7 100644
--- a/openwrt/package/libffi-sable/Config.in
+++ b/openwrt/package/libffi-sable/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBFFI_SABLE
-	tristate "libffi-sable - Foreign Function Interface library (for sablevm)"
+	prompt "libffi-sable...................... Foreign Function Interface library (for sablevm)"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The libffi library provides a portable, high level programming
@@ -8,4 +9,4 @@ config BR2_PACKAGE_LIBFFI_SABLE
 	  time.  
 	  
 	  http://sources.redhat.com/libffi/
-	  
+
diff --git a/openwrt/package/libgcrypt/Config.in b/openwrt/package/libgcrypt/Config.in
index 117365baa..e75c7744a 100644
--- a/openwrt/package/libgcrypt/Config.in
+++ b/openwrt/package/libgcrypt/Config.in
@@ -1,14 +1,15 @@
 config BR2_PACKAGE_LIBGCRYPT
-	tristate "libgcrypt - The GNU crypto library"
+	prompt "libgcrypt......................... The GNU crypto library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
-	 This is a general purpose cryptographic library based on the code from 
-	 GnuPG. It provides functions for all cryptograhic building blocks: 
-	 symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash 
-	 algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all 
-	 hash algorithms), public key algorithms (RSA, ElGamal, DSA), large 
-	 integer functions, random numbers and a lot of supporting functions.
-	 
-	 http://directory.fsf.org/security/libgcrypt.html
-	 
+	  This is a general purpose cryptographic library based on the code from 
+	  GnuPG. It provides functions for all cryptograhic building blocks: 
+	  symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash 
+	  algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all 
+	  hash algorithms), public key algorithms (RSA, ElGamal, DSA), large 
+	  integer functions, random numbers and a lot of supporting functions.
+	  
+	  http://directory.fsf.org/security/libgcrypt.html
+
diff --git a/openwrt/package/libgd/Config.in b/openwrt/package/libgd/Config.in
index 1cb90be05..4d1efda80 100644
--- a/openwrt/package/libgd/Config.in
+++ b/openwrt/package/libgd/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_LIBGD
-	tristate "libgd - The GD Graphics Library"
+	prompt "libgd............................. The GD Graphics Library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 The GD Graphics Library
-	 
-	 http://www.boutell.com/gd/
-	 
-
+	  The GD Graphics Library
 	  
+	  http://www.boutell.com/gd/
+
diff --git a/openwrt/package/libgdbm/Config.in b/openwrt/package/libgdbm/Config.in
index 20feb7408..c969a947c 100644
--- a/openwrt/package/libgdbm/Config.in
+++ b/openwrt/package/libgdbm/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBGDBM
-	tristate "libgdbm - GNU database manager"
+	prompt "libgdbm........................... The GNU database manager"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 disk file format database which stores key/data-pairs in single files.  
+	  disk file format database which stores key/data-pairs in single files.  
 	  
 	  http://www.gnu.org
+
diff --git a/openwrt/package/libgpg-error/Config.in b/openwrt/package/libgpg-error/Config.in
index 5987840ac..1a6b00374 100644
--- a/openwrt/package/libgpg-error/Config.in
+++ b/openwrt/package/libgpg-error/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_LIBGPG_ERROR
-	tristate "libgpg-error - An helper library for common error codes and descriptions"
+	prompt "libgpg-error...................... An helper library for common error codes and descriptions"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 This is a library that defines common error values for all GnuPG
-	 components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
-	 Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
-	 future.
-	 
-	 http://www.gnupg.org/related_software/libgpg-error/
-	 
+	  This is a library that defines common error values for all GnuPG
+	  components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+	  Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
+	  future.
+	  
+	  http://www.gnupg.org/related_software/libgpg-error/
+
diff --git a/openwrt/package/libid3tag/Config.in b/openwrt/package/libid3tag/Config.in
index c507b80ba..8ee04ab9e 100644
--- a/openwrt/package/libid3tag/Config.in
+++ b/openwrt/package/libid3tag/Config.in
@@ -1,12 +1,13 @@
 config BR2_PACKAGE_LIBID3TAG
-	tristate "libid3tag - An ID3 tag manipulation library"
+	prompt "libid3tag......................... An ID3 tag manipulation library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ZLIB
 	help
-	 libid3tag is a library for reading and (eventually) writing ID3 tags, both
-	 ID3v1 and the various versions of ID3v2.
-	 
-	 http://mad.sourceforge.net/
-	 
-	 Depends: zlib
-	 
+	  libid3tag is a library for reading and (eventually) writing ID3 tags, both
+	  ID3v1 and the various versions of ID3v2.
+	  
+	  http://mad.sourceforge.net/
+	  
+	  Depends: zlib
+
diff --git a/openwrt/package/libmad/Config.in b/openwrt/package/libmad/Config.in
index ccbfa4b84..480b0e128 100644
--- a/openwrt/package/libmad/Config.in
+++ b/openwrt/package/libmad/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBMAD
-	tristate "libmad - An high-quality MPEG audio decoding library"
+	prompt "libmad............................ An high-quality MPEG audio decoding library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  MAD is a high-quality MPEG audio decoder. It currently supports 
@@ -8,4 +9,4 @@ config BR2_PACKAGE_LIBMAD
 	  Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
 	  
 	  http://www.underbit.com/products/mad/
-	  
+
diff --git a/openwrt/package/libnet/Config.in b/openwrt/package/libnet/Config.in
index ffa6f08f3..a3cb965c3 100644
--- a/openwrt/package/libnet/Config.in
+++ b/openwrt/package/libnet/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNET
-	tristate "libnet - Low-level packet creation library"
+	prompt "libnet............................ Low-level packet creation library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	help
@@ -8,5 +9,4 @@ config BR2_PACKAGE_LIBNET
 	  http://www.packetfactory.net/libnet/
 	  
 	  Depends: libpcap
-	  
 
diff --git a/openwrt/package/libnids/Config.in b/openwrt/package/libnids/Config.in
index a97029c70..0c98be21a 100644
--- a/openwrt/package/libnids/Config.in
+++ b/openwrt/package/libnids/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBNIDS
-	tristate "libnids - network intrusion detection library"
+	prompt "libnids........................... A network intrusion detection library"
+	tristate
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBNET
 	default m if CONFIG_DEVEL
@@ -7,4 +8,4 @@ config BR2_PACKAGE_LIBNIDS
 	  An implementation of an E-component of Network Intrusion Detection System.
 	  
 	  http://www.packetfactory.net/projects/libnids/
-	  
+
diff --git a/openwrt/package/libogg/Config.in b/openwrt/package/libogg/Config.in
index 98632ddb5..b27f1a90f 100644
--- a/openwrt/package/libogg/Config.in
+++ b/openwrt/package/libogg/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_LIBOGG
-	tristate "libogg - The Ogg bitstream handling library"
+	prompt "libogg............................ The Ogg bitstream handling library"
+	tristate
 	default n
 	help
 	  The Ogg bitstream handling library.
 	  
 	  http://www.vorbis.com/
-	  
+
diff --git a/openwrt/package/libosip2/Config.in b/openwrt/package/libosip2/Config.in
index 500dbb1c3..456865c7b 100644
--- a/openwrt/package/libosip2/Config.in
+++ b/openwrt/package/libosip2/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBOSIP2
-	tristate "libosip2 - GNU oSIP library"
+	prompt "libosip2.......................... The GNU oSIP library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  GNU oSIP library, a Session Initiation Protocol (SIP) implementation
 	  
 	  http://www.gnu.org/software/osip/
-	  
diff --git a/openwrt/package/libpcap/Config.in b/openwrt/package/libpcap/Config.in
index 0b3f441d8..d2075647e 100644
--- a/openwrt/package/libpcap/Config.in
+++ b/openwrt/package/libpcap/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBPCAP
-	tristate "libpcap - Low-level packet capture library"
+	prompt "libpcap........................... Low-level packet capture library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A system-independent library for user-level network packet capture.
-
+	  
 	  http://www.tcpdump.org/
+
diff --git a/openwrt/package/libpng/Config.in b/openwrt/package/libpng/Config.in
index 59ba4579f..1b51de175 100644
--- a/openwrt/package/libpng/Config.in
+++ b/openwrt/package/libpng/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LIBPNG
-	tristate "libpng - PNG (Portable Network Graphics) format files handling library"
+	prompt "libpng............................ PNG (Portable Network Graphics) format files handling library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_ZLIB
 	help
 	  A library for reading/writing PNG files
 	  
 	  http://www.libpng.org/pub/png/libpng.html
-	  
 
diff --git a/openwrt/package/libpthread/Config.in b/openwrt/package/libpthread/Config.in
index b51850c6e..fb6cb5841 100644
--- a/openwrt/package/libpthread/Config.in
+++ b/openwrt/package/libpthread/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBPTHREAD
-	tristate "libpthread - POSIX threads library"
+	prompt "libpthread........................ POSIX threads library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  POSIX threads library
-	  
+
diff --git a/openwrt/package/libtasn1/Config.in b/openwrt/package/libtasn1/Config.in
index b47b934db..4553c25b2 100644
--- a/openwrt/package/libtasn1/Config.in
+++ b/openwrt/package/libtasn1/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_LIBTASN1
-	tristate "libtasn1 - an ASN.1 and DER structures manipulation library"
+	prompt "libtasn1.......................... An ASN.1 and DER structures manipulation library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	help
-	 This is a library for Abstract Syntax Notation One (ASN.1) and 
-	 Distinguish Encoding Rules (DER) manipulation.
-	 
-	 ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
-	 
+	  This is a library for Abstract Syntax Notation One (ASN.1) and 
+	  Distinguish Encoding Rules (DER) manipulation.
+	  
+	  ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
+
diff --git a/openwrt/package/libtool/Config.in b/openwrt/package/libtool/Config.in
index a7ab8329a..5102863a3 100644
--- a/openwrt/package/libtool/Config.in
+++ b/openwrt/package/libtool/Config.in
@@ -1,13 +1,14 @@
+config BR2_COMPILE_LIBTOOL
+	bool
+	depends BR2_PACKAGE_LIBLTDL
+
 config BR2_PACKAGE_LIBLTDL
-	tristate "libltdl - Generic dynamic object loading library"
+	prompt "libltdl........................... A generic dynamic object loading library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_LIBTOOL
 	help
 	  A generic dynamic object loading library.
 	  
 	  http://www.gnu.org/software/libtool/
-	  
-
-config BR2_PACKAGE_LIBTOOL
-	tristate
-	default BR2_PACKAGE_LIBLTDL
 
diff --git a/openwrt/package/libupnp/Config.in b/openwrt/package/libupnp/Config.in
index 01f878f13..bbe822efe 100644
--- a/openwrt/package/libupnp/Config.in
+++ b/openwrt/package/libupnp/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_LIBUPNP
-	tristate "libupnp - Universal Plug and Play (UPnP) SDK library"
+	prompt "libupnp........................... Universal Plug and Play (UPnP) SDK library"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 The Universal Plug and Play (UPnP) SDK for Linux provides support 
-	 for building UPnP-compliant control points, devices, and bridges 
-	 on Linux.
-	 
-	 http://upnp.sourceforge.net/
-	 
-	 Depends: libpthread
-	 
+	  The Universal Plug and Play (UPnP) SDK for Linux provides support 
+	  for building UPnP-compliant control points, devices, and bridges 
+	  on Linux.
+	  
+	  http://upnp.sourceforge.net/
+	  
+	  Depends: libpthread
 
diff --git a/openwrt/package/libusb/Config.in b/openwrt/package/libusb/Config.in
index 8ac0c70f2..d38581a9e 100644
--- a/openwrt/package/libusb/Config.in
+++ b/openwrt/package/libusb/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBUSB
-	tristate "libusb - Library for accessing Linux USB devices"
+	prompt "libusb............................ A library for accessing Linux USB devices"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A library for accessing Linux USB devices
 	  
 	  http://libusb.sourceforge.net/
-	  
 
diff --git a/openwrt/package/libvorbis/Config.in b/openwrt/package/libvorbis/Config.in
index 67c5cabd1..805f1f8ba 100644
--- a/openwrt/package/libvorbis/Config.in
+++ b/openwrt/package/libvorbis/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_LIBVORBIS
-	tristate "libvorbis - The Vorbis General Audio Compression Codec library"
+	prompt "libvorbis......................... The Vorbis General Audio Compression Codec library"
+	tristate
 	default n
 	select BR2_PACKAGE_LIBOGG
 	help
 	  The Vorbis General Audio Compression Codec library.
 	  
 	  http://www.vorbis.com/
-	  
+
diff --git a/openwrt/package/libvorbisidec/Config.in b/openwrt/package/libvorbisidec/Config.in
index 6532c71e5..640e3e2ae 100644
--- a/openwrt/package/libvorbisidec/Config.in
+++ b/openwrt/package/libvorbisidec/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBVORBISIDEC
-	tristate "libvorbisidec - a fixed-point implementation (Tremor) of libogg/libvorbis"
+	prompt "libvorbisidec..................... A fixed-point implementation (Tremor) of libogg/libvorbis"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  libvorbisidec is "tremor", a fixed-point implementation of libvorbis.
@@ -8,4 +9,4 @@ config BR2_PACKAGE_LIBVORBISIDEC
 	  Tremor is a decoder only.
 	  
 	  http://http://wiki.xiph.org/index.php/Tremor
-	  
+
diff --git a/openwrt/package/libxml2/Config.in b/openwrt/package/libxml2/Config.in
index 2c132963d..f4632eb06 100644
--- a/openwrt/package/libxml2/Config.in
+++ b/openwrt/package/libxml2/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBXML2
-	tristate "libxml2 - Gnome XML library"
+	prompt "libxml2........................... Gnome XML library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_ZLIB
@@ -7,4 +8,4 @@ config BR2_PACKAGE_LIBXML2
 	  A library for manipulating XML and HTML resources.
 	  
 	  http://xmlsoft.org/
-	  
+
diff --git a/openwrt/package/libxslt/Config.in b/openwrt/package/libxslt/Config.in
index c0ec6cd8f..e4857fc12 100644
--- a/openwrt/package/libxslt/Config.in
+++ b/openwrt/package/libxslt/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_LIBXSLT
-	tristate "libxslt - Gnome XSLT library"
+	prompt "libxslt........................... Gnome XSLT library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBXML2
 	help
 	  A library for XML transformation using XSLT.
 	  
 	  http://xmlsoft.org/XSLT/
-	  
+
diff --git a/openwrt/package/lighttpd/Config.in b/openwrt/package/lighttpd/Config.in
index 992cecbfc..997036c57 100644
--- a/openwrt/package/lighttpd/Config.in
+++ b/openwrt/package/lighttpd/Config.in
@@ -1,7 +1,7 @@
-menu "lighttpd - Flexible and lightweight web server"
+menu "lighttpd.......................... Flexible and lightweight web server"
 
 config BR2_PACKAGE_LIGHTTPD
-	prompt "lighttpd - Flexible and lightweight web server"
+	prompt "lighttpd.......................... Flexible and lightweight web server"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
@@ -12,84 +12,83 @@ config BR2_PACKAGE_LIGHTTPD
 	  http://www.lighttpd.net/
 	  
 	  Depends: libopenssl, libpcre
-	  
 
 config BR2_PACKAGE_LIGHTTPD_MOD_ALIAS
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-alias - Directory alias module"
+	prompt   "lighttpd-mod-alias.............. Directory alias module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_AUTH
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-auth - Authentication module"
+	prompt   "lighttpd-mod-auth............... Authentication module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_CGI
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-cgi - CGI module"
+	prompt   "lighttpd-mod-cgi................ CGI module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_EXPIRE
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-expire - Expire module"
+	prompt   "lighttpd-mod-expire............. Expire module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_FASTCGI
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-fastcgi - FastCGI module"
+	prompt   "lighttpd-mod-fastcgi............ FastCGI module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_PROXY
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-proxy - Proxy module"
+	prompt   "lighttpd-mod-proxy.............. Proxy module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_REDIRECT
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-redirect - URL redirection module"
+	prompt   "lighttpd-mod-redirect........... URL redirection module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_REWRITE
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-rewrite - URL rewriting module"
+	prompt   "lighttpd-mod-rewrite............ URL rewriting module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SETENV
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-setenv - Environment variable setting module"
+	prompt   "lighttpd-mod-setenv............. Environment variable setting module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-simple-vhost - Simple virtual hosting module"
+	prompt   "lighttpd-mod-simple-vhost....... Simple virtual hosting module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_SSI
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-ssi - SSI module"
+	prompt   "lighttpd-mod-ssi................ SSI module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_STATUS
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-status - Server status display module"
+	prompt   "lighttpd-mod-status............. Server status display module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 config BR2_PACKAGE_LIGHTTPD_MOD_USERTRACK
-	depends BR2_PACKAGE_LIGHTTPD
-	prompt "...-mod-usertrack - User tracking module"
+	prompt   "lighttpd-mod-usertrack.......... User tracking module"
 	tristate 
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIGHTTPD
 
 endmenu
diff --git a/openwrt/package/linux-atm/Config.in b/openwrt/package/linux-atm/Config.in
index 885c55442..b5c1f9530 100644
--- a/openwrt/package/linux-atm/Config.in
+++ b/openwrt/package/linux-atm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LINUX_ATM
-	tristate "linux-atm - ATM Library/Utilities for Linux"
+	prompt "linux-atm......................... ATM Library/Utilities for Linux"
+	tristate
 	default y if BR2_LINUX_2_4_AR7
 	help
 	  ATM Library for linux
@@ -7,7 +8,8 @@ config BR2_PACKAGE_LINUX_ATM
 	  http://ftp.debian.org/debian/pool/main/l/linux-atm/
 
 config BR2_PACKAGE_BR2684CTL
-	tristate "br2684ctl - RFC2684 bridging utility"
+	prompt   "br2684ctl....................... RFC2684 bridging utility"
+	tristate
 	default y if BR2_LINUX_2_4_AR7
 	depends BR2_PACKAGE_LINUX_ATM
 	help
@@ -15,3 +17,4 @@ config BR2_PACKAGE_BR2684CTL
 	  Useful for PPPoE
 	  
 	  http://ftp.debian.org/debian/pool/main/l/linux-atm/
+
diff --git a/openwrt/package/lua/Config.in b/openwrt/package/lua/Config.in
index 22989ac58..d62e9931d 100644
--- a/openwrt/package/lua/Config.in
+++ b/openwrt/package/lua/Config.in
@@ -1,15 +1,14 @@
-menu "lua - LUA programming language"
+menu "lua............................... LUA programming language"
 
-config BR2_PACKAGE_LUA
+config BR2_COMPILE_LUA
 	bool
-	default n
+	default y
 	depends BR2_PACKAGE_LUA_INTERPRETER || BR2_PACKAGE_LUA_COMPILER || BR2_PACKAGE_LIBLUA
 
-config BR2_PACKAGE_LUA_INTERPRETER
-	tristate "lua - LUA programming language interpreter"
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
-	select BR2_PACKAGE_LIBLUA
+config BR2_PACKAGE_LIBLUA
+	prompt "liblua............................ LUA programming language shared libraries"
+	tristate
+	select BR2_COMPILE_LUA
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
 	  applications. Lua is also frequently used as a general-purpose, stand-alone 
@@ -29,13 +28,13 @@ config BR2_PACKAGE_LUA_INTERPRETER
 	  
 	  http://www.lua.org/
 	  
-	  This package contains the LUA language interpreter.
-	  
+	  This package contains the LUA shared libraries, needed by other programs.
 
-config BR2_PACKAGE_LUA_COMPILER
-	tristate "luac - LUA programming language compiler"
+config BR2_PACKAGE_LUA_INTERPRETER
+	prompt "lua............................... LUA programming language interpreter"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
+	select BR2_COMPILE_LUA
 	select BR2_PACKAGE_LIBLUA
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
@@ -56,14 +55,14 @@ config BR2_PACKAGE_LUA_COMPILER
 	  
 	  http://www.lua.org/
 	  
-	  This package contains the LUA language compiler.
-	  
+	  This package contains the LUA language interpreter.
 
-config BR2_PACKAGE_LUA_EXAMPLES
-	tristate "lua-examples - LUA programming language examples"
+config BR2_PACKAGE_LUA_COMPILER
+	prompt "luac.............................. LUA programming language compiler"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
-	select BR2_PACKAGE_LUA_INTERPRETER
+	select BR2_COMPILE_LUA
+	select BR2_PACKAGE_LIBLUA
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
 	  applications. Lua is also frequently used as a general-purpose, stand-alone 
@@ -83,13 +82,14 @@ config BR2_PACKAGE_LUA_EXAMPLES
 	  
 	  http://www.lua.org/
 	  
-	  This package contains LUA language examples.
-	  
+	  This package contains the LUA language compiler.
 
-config BR2_PACKAGE_LIBLUA
-	tristate "liblua - LUA programming language shared libraries"
+config BR2_PACKAGE_LUA_EXAMPLES
+	prompt "lua-examples...................... LUA programming language examples"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
+	select BR2_COMPILE_LUA
+	select BR2_PACKAGE_LUA_INTERPRETER
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
 	  applications. Lua is also frequently used as a general-purpose, stand-alone 
@@ -109,7 +109,6 @@ config BR2_PACKAGE_LIBLUA
 	  
 	  http://www.lua.org/
 	  
-	  This package contains the LUA shared libraries, needed by other programs.
-	  
+	  This package contains LUA language examples.
 
 endmenu
diff --git a/openwrt/package/lua/Makefile b/openwrt/package/lua/Makefile
index 4b062de33..4896006f9 100644
--- a/openwrt/package/lua/Makefile
+++ b/openwrt/package/lua/Makefile
@@ -20,8 +20,8 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBLUA,liblua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_INTERPRETER,lua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_COMPILER,luac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LUA,lua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LUAC,luac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
@@ -61,17 +61,17 @@ $(IPKG_LIBLUA):
 	$(RSTRIP) $(IDIR_LIBLUA)
 	$(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR)
 
-$(IPKG_LUA_INTERPRETER):
-	install -d -m0755 $(IDIR_LUA_INTERPRETER)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA_INTERPRETER)/usr/bin/
-	$(RSTRIP) $(IDIR_LUA_INTERPRETER)
-	$(IPKG_BUILD) $(IDIR_LUA_INTERPRETER) $(PACKAGE_DIR)
-
-$(IPKG_LUA_COMPILER):
-	install -d -m0755 $(IDIR_LUA_COMPILER)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUA_COMPILER)/usr/bin/
-	$(RSTRIP) $(IDIR_LUA_COMPILER)
-	$(IPKG_BUILD) $(IDIR_LUA_COMPILER) $(PACKAGE_DIR)
+$(IPKG_LUA):
+	install -d -m0755 $(IDIR_LUA)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA)/usr/bin/
+	$(RSTRIP) $(IDIR_LUA)
+	$(IPKG_BUILD) $(IDIR_LUA) $(PACKAGE_DIR)
+
+$(IPKG_LUAC):
+	install -d -m0755 $(IDIR_LUAC)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUAC)/usr/bin/
+	$(RSTRIP) $(IDIR_LUAC)
+	$(IPKG_BUILD) $(IDIR_LUAC) $(PACKAGE_DIR)
 
 $(IPKG_LUA_EXAMPLES):
 	install -d -m0755 $(IDIR_LUA_EXAMPLES)/usr/share/lua/examples
diff --git a/openwrt/package/lzo/Config.in b/openwrt/package/lzo/Config.in
index 7a0bd4c8a..58000d977 100644
--- a/openwrt/package/lzo/Config.in
+++ b/openwrt/package/lzo/Config.in
@@ -1,12 +1,15 @@
+config BR2_COMPILE_LZO
+	bool
+	default n
+	depends BR2_PACKAGE_LIBLZO
+
 config BR2_PACKAGE_LIBLZO
-	tristate "liblzo - Real-time data compression library"
+	prompt "liblzo............................ Real-time data compression library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_LZO
 	help
 	  A real-time data compression library
 	  
 	  http://www.oberhumer.com/opensource/lzo/
-	  
 
-config BR2_PACKAGE_LZO
-	tristate
-	default BR2_PACKAGE_LIBLZO
diff --git a/openwrt/package/madwifi-tools/Config.in b/openwrt/package/madwifi-tools/Config.in
index 30f356383..96ff5dd2f 100644
--- a/openwrt/package/madwifi-tools/Config.in
+++ b/openwrt/package/madwifi-tools/Config.in
@@ -1,6 +1,9 @@
 config BR2_PACKAGE_MADWIFI_TOOLS
-	prompt "madwifi-tools - utilities for configuring the Atheros Wifi driver"
+	prompt "madwifi-tools..................... Utilities for configuring the Atheros Wifi driver"
 	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Driver utilities for Atheros 802.11a/b/g MiniPCI cards
+	  
+	  http://www.madwifi.org/
+
diff --git a/openwrt/package/maradns/Config.in b/openwrt/package/maradns/Config.in
index 87a5632ce..7c6974c86 100644
--- a/openwrt/package/maradns/Config.in
+++ b/openwrt/package/maradns/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_MARADNS
-	tristate "maradns - Small and secure DNS Server"
+	prompt "maradns........................... Small and secure DNS Server"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A small and secure DNS server
 	  
 	  http://www.maradns.org/
-	  
 
diff --git a/openwrt/package/matrixssl/Config.in b/openwrt/package/matrixssl/Config.in
index db5abb113..be0a306fb 100644
--- a/openwrt/package/matrixssl/Config.in
+++ b/openwrt/package/matrixssl/Config.in
@@ -1,15 +1,17 @@
+config BR2_COMPILE_MATRIXSSL
+	bool
+	depends BR2_PACKAGE_LIBMATRIXSSL
+
 config BR2_PACKAGE_LIBMATRIXSSL
-	select BR2_PACKAGE_LIBPTHREAD
-	tristate "libmatrixssl - Embedded SSL implementation"
+	prompt "libmatrixssl...................... Embedded SSL implementation"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_MATRIXSSL
+	select BR2_PACKAGE_LIBPTHREAD
 	help
 	  An embedded SSL implementation
 	  
 	  http://www.matrixssl.org/
 	  
 	  Depends: libpthread
-	  
 
-config BR2_PACKAGE_MATRIXSSL
-	tristate
-	default BR2_PACKAGE_LIBMATRIXSSL
diff --git a/openwrt/package/microcom/Config.in b/openwrt/package/microcom/Config.in
index 5eea1303d..a37115682 100644
--- a/openwrt/package/microcom/Config.in
+++ b/openwrt/package/microcom/Config.in
@@ -1,6 +1,10 @@
 config BR2_PACKAGE_MICROCOM
-	tristate "microcom (serial terminal)"
+	prompt "microcom.......................... Serial terminal"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  microcom is a minicom-like serial terminal emulator with scripting 
 	  support.
+	  
+	  http://microcomlinux.homestead.com/
+
diff --git a/openwrt/package/microperl/Config.in b/openwrt/package/microperl/Config.in
index 957ac8a6b..2f49de0c1 100644
--- a/openwrt/package/microperl/Config.in
+++ b/openwrt/package/microperl/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_MICROPERL
-	tristate "microperl - A really minimal perl"
+	prompt "microperl......................... A really minimal perl"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Perl without operating-specific functions such as readdir.
+
diff --git a/openwrt/package/mini_httpd/Config.in b/openwrt/package/mini_httpd/Config.in
index fb319ae12..2273499fb 100644
--- a/openwrt/package/mini_httpd/Config.in
+++ b/openwrt/package/mini_httpd/Config.in
@@ -1,17 +1,20 @@
+menu "mini-httpd........................ A small web server"
+
 config BR2_COMPILE_MINI_HTTPD
 	bool
 	default n
 	depends BR2_PACKAGE_MINI_HTTPD || BR2_PACKAGE_MINI_HTTPD_MATRIXSSL || BR2_PACKAGE_MINI_HTTPD_OPENSSL
 
 config BR2_PACKAGE_MINI_HTTPD
-	tristate "mini-httpd - A small web server"
+	prompt "mini-httpd........................ A small web server"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_MINI_HTTPD
 	help
-	 mini_httpd is a small HTTP server. Its performance is not great, but for 
-	 low or medium traffic sites it's quite adequate. It implements all the 
-	 basic features of an HTTP server, including:
-	 
+	  mini_httpd is a small HTTP server. Its performance is not great, but for 
+	  low or medium traffic sites it's quite adequate. It implements all the 
+	  basic features of an HTTP server, including:
+	  
 	     * GET, HEAD, and POST methods.
 	     * CGI.
 	     * Basic authentication.
@@ -23,22 +26,22 @@ config BR2_PACKAGE_MINI_HTTPD
 	     * Multihoming / virtual hosting.
 	     * Standard logging.
 	     * Custom error pages. 
-	 
-	 It can also be configured to do IPv6. 
-	 
-	 http://www.acme.com/software/mini_httpd/
-	 
+	  
+	  It can also be configured to do IPv6. 
+	  
+	  http://www.acme.com/software/mini_httpd/
 
 config BR2_PACKAGE_MINI_HTTPD_MATRIXSSL
-	tristate "mini-httpd-matrixssl - A small web server, built with SSL support using MatrixSSL"
+	prompt "mini-httpd-matrixssl.............. A small web server, built with SSL support using MatrixSSL"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_MINI_HTTPD
 	select BR2_PACKAGE_LIBMATRIXSSL
 	help
-	 mini_httpd is a small HTTP server. Its performance is not great, but for 
-	 low or medium traffic sites it's quite adequate. It implements all the 
-	 basic features of an HTTP server, including:
-	 
+	  mini_httpd is a small HTTP server. Its performance is not great, but for 
+	  low or medium traffic sites it's quite adequate. It implements all the 
+	  basic features of an HTTP server, including:
+	  
 	     * GET, HEAD, and POST methods.
 	     * CGI.
 	     * Basic authentication.
@@ -50,22 +53,22 @@ config BR2_PACKAGE_MINI_HTTPD_MATRIXSSL
 	     * Multihoming / virtual hosting.
 	     * Standard logging.
 	     * Custom error pages. 
-	 
-	 It can also be configured to do SSL/HTTPS and IPv6. 
-	 
-	 http://www.acme.com/software/mini_httpd/
-	 
+	  
+	  It can also be configured to do SSL/HTTPS and IPv6. 
+	  
+	  http://www.acme.com/software/mini_httpd/
 
 config BR2_PACKAGE_MINI_HTTPD_OPENSSL
-	tristate "mini-httpd-openssl - A small web server, built with SSL support using OpenSSL"
+	prompt "mini-httpd-openssl................ A small web server, built with SSL support using OpenSSL"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_MINI_HTTPD
 	select BR2_PACKAGE_LIBOPENSSL
 	help
-	 mini_httpd is a small HTTP server. Its performance is not great, but for 
-	 low or medium traffic sites it's quite adequate. It implements all the 
-	 basic features of an HTTP server, including:
-	 
+	  mini_httpd is a small HTTP server. Its performance is not great, but for 
+	  low or medium traffic sites it's quite adequate. It implements all the 
+	  basic features of an HTTP server, including:
+	  
 	     * GET, HEAD, and POST methods.
 	     * CGI.
 	     * Basic authentication.
@@ -77,8 +80,9 @@ config BR2_PACKAGE_MINI_HTTPD_OPENSSL
 	     * Multihoming / virtual hosting.
 	     * Standard logging.
 	     * Custom error pages. 
-	 
-	 It can also be configured to do SSL/HTTPS and IPv6. 
-	 
-	 http://www.acme.com/software/mini_httpd/
-	 
+	  
+	  It can also be configured to do SSL/HTTPS and IPv6. 
+	  
+	  http://www.acme.com/software/mini_httpd/
+
+endmenu
diff --git a/openwrt/package/mini_sendmail/Config.in b/openwrt/package/mini_sendmail/Config.in
index 2af7289f6..1b0a4ff32 100644
--- a/openwrt/package/mini_sendmail/Config.in
+++ b/openwrt/package/mini_sendmail/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_MINI_SENDMAIL
-	tristate "mini-sendmail - A small sendmail-compatible mail forwarder"
+	prompt "mini-sendmail..................... A small sendmail-compatible mail forwarder"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 mini_sendmail reads its standard input up to an end-of-file and sends a 
-	 copy of the message found there to all of the addresses listed.
-	 The message is sent by connecting to a local SMTP server. This means 
-	 mini_sendmail can be used to send email from inside a chroot(2) area. 
-	 
-	 http://www.acme.com/software/mini_sendmail/
-	 
+	  mini_sendmail reads its standard input up to an end-of-file and sends a 
+	  copy of the message found there to all of the addresses listed.
+	  The message is sent by connecting to a local SMTP server. This means 
+	  mini_sendmail can be used to send email from inside a chroot(2) area. 
+	  
+	  http://www.acme.com/software/mini_sendmail/
+
diff --git a/openwrt/package/miredo/Config.in b/openwrt/package/miredo/Config.in
index d118052b8..d07dd8162 100644
--- a/openwrt/package/miredo/Config.in
+++ b/openwrt/package/miredo/Config.in
@@ -1,10 +1,10 @@
 config BR2_COMPILE_MIREDO
-	tristate
+	bool
 	default n
 	depends BR2_PACKAGE_MIREDO || BR2_PACKAGE_MIREDO_SERVER
 
 config BR2_PACKAGE_MIREDO
-	prompt "miredo - a Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon"
+	prompt "miredo............................ Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_MIREDO
@@ -13,7 +13,6 @@ config BR2_PACKAGE_MIREDO
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_UCLIBCXX
 	help
-	  
 	  A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon.
 	  
 	  http://www.simphalempin.com/dev/miredo/
@@ -23,10 +22,9 @@ config BR2_PACKAGE_MIREDO
 	    - kmod-tun
 	    - libpthread
 	    - uClibc++
-	  
 
 config BR2_PACKAGE_MIREDO_SERVER
-	prompt "miredo-server - a Teredo (IPv6 tunneling over UDP through NAT) server daemon"
+	prompt "miredo-server..................... Teredo (IPv6 tunneling over UDP through NAT) server daemon"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_MIREDO
@@ -35,7 +33,6 @@ config BR2_PACKAGE_MIREDO_SERVER
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_UCLIBCXX
 	help
-	  
 	  A Teredo (IPv6 tunneling over UDP through NAT) server daemon.
 	  
 	  http://www.simphalempin.com/dev/miredo/
@@ -45,4 +42,3 @@ config BR2_PACKAGE_MIREDO_SERVER
 	    - kmod-tun
 	    - libpthread
 	    - uClibc++
-	  
diff --git a/openwrt/package/monit/Config.in b/openwrt/package/monit/Config.in
index 247215889..e07fd628b 100644
--- a/openwrt/package/monit/Config.in
+++ b/openwrt/package/monit/Config.in
@@ -1,10 +1,13 @@
+#menu "monit............................. System services monitoring utility"
+
 config BR2_COMPILE_MONIT
 	bool
 	default n
 	depends BR2_PACKAGE_MONIT || BR2_PACKAGE_MONIT_NOSSL
 
 config BR2_PACKAGE_MONIT
-	tristate "monit - System services monitoring utility, with SSL support"
+	prompt "monit............................. System services monitoring utility, with SSL support"
+	tristate
 	select BR2_COMPILE_MONIT
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_LIBOPENSSL
@@ -15,10 +18,10 @@ config BR2_PACKAGE_MONIT
 	  This package is built with SSL support.
 	  
 	  http://www.tildeslash.com/monit/
-	  
 
 config BR2_PACKAGE_MONIT_NOSSL
-	tristate "monit-nossl - System services monitoring utility, without SSL support"
+	prompt "monit-nossl....................... System services monitoring utility, without SSL support"
+	tristate
 	select BR2_COMPILE_MONIT
 	select BR2_PACKAGE_LIBPTHREAD
 	default m if CONFIG_DEVEL
@@ -28,4 +31,5 @@ config BR2_PACKAGE_MONIT_NOSSL
 	  This package is built without SSL support.
 	  
 	  http://www.tildeslash.com/monit/
-	  
+
+#endmenu
diff --git a/openwrt/package/mpd/Config.in b/openwrt/package/mpd/Config.in
index f95fef651..873b31085 100644
--- a/openwrt/package/mpd/Config.in
+++ b/openwrt/package/mpd/Config.in
@@ -1,32 +1,42 @@
+menu "mpd............................... Music Player Daemon"
+
 config BR2_PACKAGE_MPD
-	tristate "MPD - Music Player Daemon"
+	prompt "mpd............................... Music Player Daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-		MPD is a music player supporting flac, mp3 and ogg files.
-		It is typically controlled over a network using one of it's many
-		clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+	  MPD is a music player supporting flac, mp3 and ogg files.
+	  It is typically controlled over a network using one of it's many
+	  clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+	  
+	  http://www.musicpd.org/
 
-config BR2_PACKAGE_MPD_MP3
-	bool "MP3 Support - Enable mp3 support"
+config BR2_COMPILE_MPD_WITH_MP3
+	prompt   "MP3 support"
+	bool
 	default y
 	depends BR2_PACKAGE_MPD
 	select BR2_PACKAGE_LIBMAD
 	select BR2_PACKAGE_LIBID3TAG
 	help
-		Enable mp3 support (libmad).
+	  Enable mp3 support (libmad).
 
-config BR2_PACKAGE_MPD_OGG
-	bool "OGG Support - Enable ogg support"
+config BR2_COMPILE_MPD_WITH_OGG
+	prompt   "Ogg Support"
+	bool
 	default y
 	depends BR2_PACKAGE_MPD
 	select BR2_PACKAGE_LIBVORBISIDEC
 	help
-		Enable ogg support (tremor).
+	  Enable ogg support (tremor).
 
-config BR2_PACKAGE_MPD_FLAC
-	bool "FLAC Support - Enable flac support"
-	default n
+config BR2_COMPILE_MPD_WITH_FLAC
+	prompt   "FLAC Support"
+	bool
+	default y
 	depends BR2_PACKAGE_MPD
 	select BR2_PACKAGE_LIBFLAC
 	help
-		Enable flac support (libflac).
+	  Enable flac support (libflac).
+
+endmenu
diff --git a/openwrt/package/mpd/Makefile b/openwrt/package/mpd/Makefile
index 288b62a8e..71775379f 100644
--- a/openwrt/package/mpd/Makefile
+++ b/openwrt/package/mpd/Makefile
@@ -23,7 +23,7 @@ PKG_CONFIGURE_OPTIONS := \
 	--disable-mpc \
 	--disable-aac \
 
-ifneq ($(BR2_PACKAGE_MPD_MP3),)
+ifneq ($(BR2_COMPILE_MPD_WITH_MP3),)
 PKG_DEPENDS += libid3tag libmad
 PKG_CONFIGURE_OPTIONS += \
 	--with-id3tag-includes=$(STAGING_DIR)/usr/include \
@@ -34,7 +34,7 @@ else
 PKG_CONFIGURE_OPTIONS += --disable-id3 --disable-mp3
 endif
 
-ifneq ($(BR2_PACKAGE_MPD_OGG),)
+ifneq ($(BR2_COMPILE_MPD_WITH_OGG),)
 PKG_DEPENDS += libvorbisidec
 PKG_CONFIGURE_OPTIONS += \
 	--with-tremor \
@@ -44,7 +44,7 @@ else
 PKG_CONFIGURE_OPTIONS += --disable-ogg
 endif
 
-ifneq ($(BR2_PACKAGE_MPD_FLAC),)
+ifneq ($(BR2_COMPILE_MPD_WITH_FLAC),)
 PKG_DEPENDS += libflac
 PKG_CONFIGURE_OPTIONS += \
 	--with-libFLAC-includes=$(STAGING_DIR)/usr/include \
diff --git a/openwrt/package/mt-daapd/Config.in b/openwrt/package/mt-daapd/Config.in
index 126e13ffb..3eae933fc 100644
--- a/openwrt/package/mt-daapd/Config.in
+++ b/openwrt/package/mt-daapd/Config.in
@@ -1,31 +1,31 @@
 config BR2_PACKAGE_MT_DAAPD
-	prompt "mt-daapd - A multi-threaded DAAP (Digital Audio Access Protocol) daemon"
+	prompt "mt-daapd.......................... A multi-threaded DAAP (Digital Audio Access Protocol) daemon"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBGDBM
 	select BR2_PACKAGE_LIBHOWL
 	select BR2_PACKAGE_LIBID3TAG
 	help
-	 mt-daapd is a program which acts as an iTunes (DAAP) server for Linux and 
-	 other POSIX unixes. It may eventually support Win32 as well.
-	 
-	 Some random features that it supports:
-	 
-	   * Supports the Roku SoundBridge (query/browse/index support) 
-	   * Supports periodic rescans of the database 
-	   * Can advertise shoutcast streams 
-	   * Supports password-protected shares 
-	   * Is web-configurable and managable 
-	   * Support dynamic playlists, like iTunes "Smart playlists" 
-	   * Probably other things I've forgotten 
-	 
-	 All is not perfect, however. Currently, there are several drawbacks to it:
-	 
-	   * database is indexed by inode, so all music must be on one filesystem 
-	   * browse by artist is slow on Roku, times out (with large databases ~10K songs) 
-	   * Probably other things I've forgotten 
-	 
-	 http://www.mt-daapd.org/
-	 
-	 Depends: libgdbm, libhowl, libid3tag, libpthread
-	 
+	  mt-daapd is a program which acts as an iTunes (DAAP) server for Linux and 
+	  other POSIX unixes. It may eventually support Win32 as well.
+	  
+	  Some random features that it supports:
+	  
+	    * Supports the Roku SoundBridge (query/browse/index support) 
+	    * Supports periodic rescans of the database 
+	    * Can advertise shoutcast streams 
+	    * Supports password-protected shares 
+	    * Is web-configurable and managable 
+	    * Support dynamic playlists, like iTunes "Smart playlists" 
+	    * Probably other things I've forgotten 
+	  
+	  All is not perfect, however. Currently, there are several drawbacks to it:
+	  
+	    * database is indexed by inode, so all music must be on one filesystem 
+	    * browse by artist is slow on Roku, times out (with large databases ~10K songs) 
+	    * Probably other things I've forgotten 
+	  
+	  http://www.mt-daapd.org/
+	  
+	  Depends: libgdbm, libhowl, libid3tag, libpthread
+
diff --git a/openwrt/package/mtd/Config.in b/openwrt/package/mtd/Config.in
index a1b24a935..5420dff56 100644
--- a/openwrt/package/mtd/Config.in
+++ b/openwrt/package/mtd/Config.in
@@ -1,12 +1,15 @@
 config BR2_PACKAGE_MTD
-	tristate "mtd - update utility for trx firmware images"
+	prompt "mtd............................... Update utility for trx firmware images"
+	tristate
 	default y
 	help
-	 update utility for trx firmware images.
+	  Update utility for trx firmware images.
 
 config BR2_PACKAGE_MTD_STATIC
-	tristate "mtd - update utility for trx firmware images (statically linked)"
+	prompt "mtd-static........................ Update utility for trx firmware images (statically linked)"
+	tristate
 	default n
 	help
-	 update utility for trx firmware images (statically linked). To update
-	 from other firmware or older OpenWrt releases.
+	  Update utility for trx firmware images (statically linked). To update
+	  from other firmware or older OpenWrt releases.
+
diff --git a/openwrt/package/mtr/Config.in b/openwrt/package/mtr/Config.in
index fc7963b63..8f0e46167 100644
--- a/openwrt/package/mtr/Config.in
+++ b/openwrt/package/mtr/Config.in
@@ -1,17 +1,18 @@
 config BR2_PACKAGE_MTR
-	tristate "mtr - Full screen ncurses traceroute tool"
+	prompt "mtr............................... Full screen ncurses traceroute tool"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
-	 mtr combines the functionality of the 'traceroute' and 'ping' programs
-	 in a single network diagnostic tool.
-	 .
-	 As mtr starts, it investigates the network connection between the host
-	 mtr runs on and a user-specified destination host.  After it
-	 determines the address of each network hop between the machines,
-	 it sends a sequence ICMP ECHO requests to each one to determine the
-	 quality of the link to each machine.  As it does this, it prints
-	 running statistics about each machine.
-	 .
-	 http://www.bitwizard.nl/mtr/
-	 
+	  mtr combines the functionality of the 'traceroute' and 'ping' programs
+	  in a single network diagnostic tool.
+	  .
+	  As mtr starts, it investigates the network connection between the host
+	  mtr runs on and a user-specified destination host.  After it
+	  determines the address of each network hop between the machines,
+	  it sends a sequence ICMP ECHO requests to each one to determine the
+	  quality of the link to each machine.  As it does this, it prints
+	  running statistics about each machine.
+	  .
+	  http://www.bitwizard.nl/mtr/
+
diff --git a/openwrt/package/mysql/Config.in b/openwrt/package/mysql/Config.in
index 2c601912d..89f0e2648 100644
--- a/openwrt/package/mysql/Config.in
+++ b/openwrt/package/mysql/Config.in
@@ -1,16 +1,15 @@
-config BR2_PACKAGE_MYSQL
+config BR2_COMPILE_MYSQL
 	bool
 	default n
 	depends BR2_PACKAGE_LIBMYSQLCLIENT
 
 config BR2_PACKAGE_LIBMYSQLCLIENT
-	prompt "libmysqlclient - MySQL client library"
+	prompt "libmysqlclient.................... MySQL client library"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_MYSQL
+	select BR2_COMPILE_MYSQL
 	help
 	  MySQL client library.
 	  
 	  http://dev.mysql.com/
-	  
 
diff --git a/openwrt/package/nano/Config.in b/openwrt/package/nano/Config.in
index 612afdbc0..70cae5530 100644
--- a/openwrt/package/nano/Config.in
+++ b/openwrt/package/nano/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_NANO
-	tristate "nano - An enhanced clone of the Pico text editor"
+	prompt "nano.............................. An enhanced clone of the Pico text editor"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNCURSES
 	help
 	  GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor..
 	  
 	  http://www.nano-editor.org/
-	  
+
diff --git a/openwrt/package/ncurses/Config.in b/openwrt/package/ncurses/Config.in
index fd82fbac5..1fbdd7b3f 100644
--- a/openwrt/package/ncurses/Config.in
+++ b/openwrt/package/ncurses/Config.in
@@ -1,12 +1,14 @@
+config BR2_COMPILE_NCURSES
+	bool
+	depends BR2_PACKAGE_LIBNCURSES
+
 config BR2_PACKAGE_LIBNCURSES
-	tristate "libncurses - Terminal handling library"
+	prompt "libncurses........................ Terminal handling library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_NCURSES
 	help
 	  A terminal handling library
 	  
 	  http://www.gnu.org/software/ncurses/
-	  
 
-config BR2_PACKAGE_NCURSES
-	tristate
-	default BR2_PACKAGE_LIBNCURSES
diff --git a/openwrt/package/ndisc/Config.in b/openwrt/package/ndisc/Config.in
index fbf70a9a1..a1ae2dc6d 100644
--- a/openwrt/package/ndisc/Config.in
+++ b/openwrt/package/ndisc/Config.in
@@ -1,4 +1,4 @@
-menu "ndisc6 - IPv6 discovery tools"
+menu "ndisc6............................ IPv6 discovery tools"
 
 config BR2_COMPILE_NDISC6
 	bool
@@ -6,7 +6,8 @@ config BR2_COMPILE_NDISC6
 	depends BR2_PACKAGE_NDISC6 || BR2_PACKAGE_RDISC6 || BR2_PACKAGE_TCPTRACEROUTE6
 
 config BR2_PACKAGE_NDISC6
-	tristate "ndisc6 - an ICMPv6 neighbour discovery tool"
+	prompt "ndisc6............................ An ICMPv6 neighbour discovery tool"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_NDISC6
 	help
@@ -14,10 +15,10 @@ config BR2_PACKAGE_NDISC6
 	  An ICMPv6 neighbour discovery tools
 	  
 	  http://people.via.ecp.fr/~rem/ndisc6/
-	  
 
 config BR2_PACKAGE_RDISC6
-	tristate "rdisc6 - an ICMPv6 router discovery tool"
+	prompt "rdisc6............................ An ICMPv6 router discovery tool"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_NDISC6
 	help
@@ -25,10 +26,10 @@ config BR2_PACKAGE_RDISC6
 	  An ICMPv6 router discovery tool
 	  
 	  http://people.via.ecp.fr/~rem/ndisc6/
-	  
 
 config BR2_PACKAGE_TCPTRACEROUTE6
-	tristate "tcptraceroute6 - a TCP/IPv6-based traceroute implementation"
+	prompt "tcptraceroute6.................... A TCP/IPv6-based traceroute implementation"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_NDISC6
 	help
@@ -36,6 +37,5 @@ config BR2_PACKAGE_TCPTRACEROUTE6
 	  A TCP/IPv6-based traceroute implementation
 	  
 	  http://people.via.ecp.fr/~rem/ndisc6/
-	  
 
 endmenu
diff --git a/openwrt/package/net-snmp/Config.in b/openwrt/package/net-snmp/Config.in
index a18e18ea5..80c972cca 100644
--- a/openwrt/package/net-snmp/Config.in
+++ b/openwrt/package/net-snmp/Config.in
@@ -1,16 +1,16 @@
-menu "net-snmp - Open source SNMP (Simple Network Management Protocol) implementation"
+menu "net-snmp.......................... Open source SNMP (Simple Network Management Protocol) implementation"
 
 config BR2_COMPILE_NET_SNMP
 	bool
 	default n
-	depends BR2_PACKAGE_LIBNETSNMP || BR2_PACKAGE_SNMP_UTILS || BR2_PACKAGE_SNMPD || BR2_PACKAGE_SNMPD_STATIC
-	select BR2_PACKAGE_LIBELF
+	depends BR2_PACKAGE_LIBNETSNMP || BR2_PACKAGE_SNMPD_STATIC
 
 config BR2_PACKAGE_LIBNETSNMP
-	prompt "libnetsnmp - SNMP shared libraries"
+	prompt "libnetsnmp........................ SNMP shared libraries"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_NET_SNMP
+	select BR2_PACKAGE_LIBELF
 	help
 	  Simple Network Management Protocol (SNMP) is a widely used 
 	  protocol for monitoring the health and welfare of network 
@@ -21,14 +21,12 @@ config BR2_PACKAGE_LIBNETSNMP
 	  http://www.net-snmp.org/
 	  
 	  This package contains shared libraries, needed by other programs.
-	  
 
 config BR2_PACKAGE_SNMP_UTILS
-	prompt "snmp-utils - SNMP client utilities"
+	prompt   "snmp-utils...................... SNMP client utilities"
 	tristate
-	select BR2_COMPILE_NET_SNMP
-	select BR2_PACKAGE_LIBNETSNMP
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIBNETSNMP
 	help
 	  Simple Network Management Protocol (SNMP) is a widely used 
 	  protocol for monitoring the health and welfare of network 
@@ -39,14 +37,13 @@ config BR2_PACKAGE_SNMP_UTILS
 	  http://www.net-snmp.org/
 	  
 	  This package contains the SNMP client utilities.
-	  
 
 config BR2_PACKAGE_SNMPD
-	prompt "snmpd - SNMP agent"
+	prompt "snmpd............................. SNMP agent"
 	tristate
+	default m if CONFIG_DEVEL
 	select BR2_COMPILE_NET_SNMP
 	select BR2_PACKAGE_LIBNETSNMP
-	default m if CONFIG_DEVEL
 	help
 	  Simple Network Management Protocol (SNMP) is a widely used 
 	  protocol for monitoring the health and welfare of network 
@@ -57,13 +54,13 @@ config BR2_PACKAGE_SNMPD
 	  http://www.net-snmp.org/
 	  
 	  This package contains the SNMP agent, dynamically linked.
-	  
 
 config BR2_PACKAGE_SNMPD_STATIC
-	prompt "snmpd-static - SNMP agent (static)"
+	prompt "snmpd-static...................... SNMP agent (statically linked)"
 	tristate
-	select BR2_COMPILE_NET_SNMP
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_NET_SNMP
+	select BR2_PACKAGE_LIBELF
 	help
 	  Simple Network Management Protocol (SNMP) is a widely used 
 	  protocol for monitoring the health and welfare of network 
@@ -74,6 +71,5 @@ config BR2_PACKAGE_SNMPD_STATIC
 	  http://www.net-snmp.org/
 	  
 	  This package contains the SNMP agent, statically linked.
-	  
 
 endmenu
diff --git a/openwrt/package/netstat-nat/Config.in b/openwrt/package/netstat-nat/Config.in
index bedb0b7a8..26a60cda5 100644
--- a/openwrt/package/netstat-nat/Config.in
+++ b/openwrt/package/netstat-nat/Config.in
@@ -1,5 +1,6 @@
-config BR2_PACKAGE_NETSTAT-NAT
-	tristate "netstat-nat - a netstat variant for NAT connections"
+config BR2_PACKAGE_NETSTAT_NAT
+	prompt "netstat-nat....................... A netstat variant for NAT connections"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Netstat-nat is a small program written in C.
@@ -9,4 +10,4 @@ config BR2_PACKAGE_NETSTAT-NAT
 	  is the temporary conntrack-storage of netfilter.
 	  
 	  http://tweegy.demon.nl/projects/netstat-nat/
-	  
+
diff --git a/openwrt/package/nfs-server/Config.in b/openwrt/package/nfs-server/Config.in
index 5f410d6cb..bbc90561b 100644
--- a/openwrt/package/nfs-server/Config.in
+++ b/openwrt/package/nfs-server/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_NFS_SERVER
-	tristate "nfs-server - User Space NFS server"
+	prompt "nfs-server........................ User Space NFS server"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_PORTMAP
 	help
 	  User Space NFS Server
+
diff --git a/openwrt/package/nmap/Config.in b/openwrt/package/nmap/Config.in
index 33b663c3b..d8ab98c64 100644
--- a/openwrt/package/nmap/Config.in
+++ b/openwrt/package/nmap/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NMAP
-	tristate "nmap - Network exploration and/or security auditing utility"
+	prompt "nmap.............................. Network exploration and/or security auditing utility"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBPCRE
@@ -8,4 +9,4 @@ config BR2_PACKAGE_NMAP
 	  A free open source utility for network exploration or security auditing. 
 	  
 	  http://www.insecure.org/nmap/
-	  
+
diff --git a/openwrt/package/nocatsplash/Config.in b/openwrt/package/nocatsplash/Config.in
index ecceae4d2..174f9e666 100644
--- a/openwrt/package/nocatsplash/Config.in
+++ b/openwrt/package/nocatsplash/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_NOCATSPLASH
-	tristate "nocatsplash - Open public network gateway daemon"
+	prompt "nocatsplash....................... Open public network gateway daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 NoCatSplash is an Open Public Network Gateway Daemon.
-	 It performs as a [captive/open/active] portal. When run on a gateway/router
-	 on a network, all web requests are redirected until the client either logs
-	 in or clicks "I Accept" to an AUP. The gateway daemon then changes the
-	 firewall rules on the gateway to pass traffic for that client (based on IP
-	 address and MAC address).
+	  NoCatSplash is an Open Public Network Gateway Daemon.
+	  It performs as a [captive/open/active] portal. When run on a gateway/router
+	  on a network, all web requests are redirected until the client either logs
+	  in or clicks "I Accept" to an AUP. The gateway daemon then changes the
+	  firewall rules on the gateway to pass traffic for that client (based on IP
+	  address and MAC address).
+
diff --git a/openwrt/package/ntpclient/Config.in b/openwrt/package/ntpclient/Config.in
index 5773837c4..1e9ca925b 100644
--- a/openwrt/package/ntpclient/Config.in
+++ b/openwrt/package/ntpclient/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_NTPCLIENT
-	tristate "ntpclient - NTP (Network Time Protocol) client"
+	prompt "ntpclient......................... NTP (Network Time Protocol) client"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  NTP client for setting system time from NTP servers.
 	  
 	  http://doolittle.faludi.com/ntpclient/
-	  
 
diff --git a/openwrt/package/nvram/Config.in b/openwrt/package/nvram/Config.in
index 968a23fdb..be4138275 100644
--- a/openwrt/package/nvram/Config.in
+++ b/openwrt/package/nvram/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NVRAM
-	tristate "nvram - broadcom config utility"
+	prompt "nvram............................. Broadcom config utility"
+	tristate
 	default y 
 	depends BR2_LINUX_2_4_BRCM
 	help
diff --git a/openwrt/package/olsrd/Config.in b/openwrt/package/olsrd/Config.in
index d5082634b..79818aea0 100644
--- a/openwrt/package/olsrd/Config.in
+++ b/openwrt/package/olsrd/Config.in
@@ -1,49 +1,48 @@
-menu "olsrd - OLSR (Optimized Link State Routing) daemon"
+menu "olsrd............................. OLSR (Optimized Link State Routing) daemon"
 
 config BR2_PACKAGE_OLSRD
-	prompt "olsrd - OLSR (Optimized Link State Routing) daemon"
+	prompt "olsrd............................. OLSR (Optimized Link State Routing) daemon"
 	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The Optimized Link State Routing daemon
 	  
 	  http://www.olsr.org/
-	  
 
 config BR2_PACKAGE_OLSRD_MOD_DOT_DRAW
-	depends BR2_PACKAGE_OLSRD
-	prompt "...-mod-dot-draw - Dot topology information plugin"
+	prompt   "olsrd-mod-dot-draw.............. Dot topology information plugin"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_DYN_GW
-	depends BR2_PACKAGE_OLSRD
-	prompt "...-mod-dyn-gw - Dynamic internet gateway plugin"
+	prompt   "olsrd-mod-dyn-gw................ Dynamic internet gateway plugin"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_HTTPINFO
-	depends BR2_PACKAGE_OLSRD
-	prompt "...-mod-httpinfo - Small informative web server plugin"
+	prompt   "olsrd-mod-httpinfo.............. Small informative web server plugin"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_NAMESERVICE
-	depends BR2_PACKAGE_OLSRD
-	prompt "...-mod-nameservice - Lightweight hostname resolver plugin"
+	prompt   "olsrd-mod-nameservice........... Lightweight hostname resolver plugin"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_POWER
-	depends BR2_PACKAGE_OLSRD
-	prompt "...-mod-power - Power status plugin"
+	prompt   "olsrd-mod-power................. Power status plugin"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_SECURE
-	depends BR2_PACKAGE_OLSRD
-	prompt "...-mod-secure - Message signing plugin to secure olsrd routing domain"
+	prompt   "olsrd-mod-secure................ Message signing plugin to secure olsrd routing domain"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_OLSRD
 
 endmenu
diff --git a/openwrt/package/opencdk/Config.in b/openwrt/package/opencdk/Config.in
index 6a4cc7027..f96bd0a90 100644
--- a/openwrt/package/opencdk/Config.in
+++ b/openwrt/package/opencdk/Config.in
@@ -4,17 +4,18 @@ config BR2_PACKAGE_OPENCDK
 	depends BR2_PACKAGE_LIBOPENCDK
 
 config BR2_PACKAGE_LIBOPENCDK
-	tristate "libopencdk - The Open Crypto Development Kit library"
+	prompt "libopencdk........................ The Open Crypto Development Kit library"
+	tristate
 #	default m if CONFIG_DEVEL
 	default n
 	select BR2_PACKAGE_OPENCDK
 	select BR2_PACKAGE_LIBGCRYPT
 	help
-	 This library provides basic parts of the OpenPGP message format.
-	 For reference, please read the rfc2440.txt in the doc/ directory.
-	 Due to some possible security problems, the library also implements
-	 parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange
-	 messages with earlier PGP version < 7, you should use the compat mode.
-	 
-	 ftp://ftp.gnutls.org/pub/gnutls/opencdk/
-	 
+	  This library provides basic parts of the OpenPGP message format.
+	  For reference, please read the rfc2440.txt in the doc/ directory.
+	  Due to some possible security problems, the library also implements
+	  parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange
+	  messages with earlier PGP version < 7, you should use the compat mode.
+	  
+	  ftp://ftp.gnutls.org/pub/gnutls/opencdk/
+
diff --git a/openwrt/package/openldap/Config.in b/openwrt/package/openldap/Config.in
index 21d2301db..ba65a5ad5 100644
--- a/openwrt/package/openldap/Config.in
+++ b/openwrt/package/openldap/Config.in
@@ -1,10 +1,10 @@
-config BR2_PACKAGE_OPENLDAP
+config BR2_COMPILE_OPENLDAP
 	bool
 	default n
 	depends BR2_PACKAGE_LIBOPENLDAP
 
 config BR2_PACKAGE_LIBOPENLDAP
-	prompt "libopenldap - Open source LDAP (Lightweight Directory Access Protocol) client libraries"
+	prompt "libopenldap....................... Open source LDAP (Lightweight Directory Access Protocol) client libraries"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_OPENLDAP
@@ -16,13 +16,12 @@ config BR2_PACKAGE_LIBOPENLDAP
 	  http://www.openldap.org/
 	  
 	  This package contains the shared LDAP client libraries, needed by other programs.
-	  
 
 config BR2_PACKAGE_OPENLDAP_UTILS
-	depends BR2_PACKAGE_LIBOPENLDAP
-	prompt "openldap-utils - OpenLDAP client utilities"
+	prompt   "openldap-utils.................. OpenLDAP client utilities"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIBOPENLDAP
 	help
 	  
 	  OpenLDAP Software is an open source implementation of the 
@@ -31,5 +30,4 @@ config BR2_PACKAGE_OPENLDAP_UTILS
 	  http://www.openldap.org/
 	  
 	  This package contains client programs required to access LDAP servers.
-	  
 
diff --git a/openwrt/package/openntpd/Config.in b/openwrt/package/openntpd/Config.in
index 064275808..696e04f72 100644
--- a/openwrt/package/openntpd/Config.in
+++ b/openwrt/package/openntpd/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_OPENNTPD
-	tristate "openntpd - FREE and easy to use NTP (Network Time Protocol) implementation"
+	prompt "openntpd.......................... A free and easy to use NTP (Network Time Protocol) implementation"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  NTP server
 	  
-	  http://www.openntpd.org
-	  
+	  http://www.openntpd.org/
 
diff --git a/openwrt/package/openssh/Config.in b/openwrt/package/openssh/Config.in
index 4e902adb4..6b344f897 100644
--- a/openwrt/package/openssh/Config.in
+++ b/openwrt/package/openssh/Config.in
@@ -1,8 +1,17 @@
-menu "openssh - A free implementation of the Secure Shell protocol"
+menu "openssh........................... A free implementation of the Secure Shell protocol"
 
-config BR2_PACKAGE_OPENSSH
-	bool "OpenSSH - A free implementation of the Secure Shell protocol"
-	default y if CONFIG_DEVEL
+config BR2_COMPILE_OPENSSH
+	bool
+	default n
+	depends BR2_PACKAGE_OPENSSH_CLIENT || BR2_PACKAGE_OPENSSH_SERVER || BR2_PACKAGE_OPENSSH_SFTP_CLIENT || BR2_PACKAGE_OPENSSH_SFTP_SERVER
+
+config BR2_PACKAGE_OPENSSH_CLIENT
+	prompt "openssh-client.................... OpenSSH client"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_OPENSSH
+	select BR2_PACKAGE_LIBOPENSSL
+	select BR2_PACKAGE_ZLIB
 	help
 	  OpenSSH is a FREE version of the SSH protocol suite of network 
 	  connectivity tools that increasing numbers of people on the Internet 
@@ -17,41 +26,92 @@ config BR2_PACKAGE_OPENSSH
 	  http://www.openssh.com/
 	  
 	  Depends: openssl
-	  
-
-config BR2_PACKAGE_OPENSSH_CLIENT
-	tristate "openssh-client - OpenSSH client"
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_OPENSSH
-	select BR2_PACKAGE_LIBOPENSSL
-	select BR2_PACKAGE_ZLIB
 
 config BR2_PACKAGE_OPENSSH_CLIENT_UTILS
-	tristate "openssh-client-utils - OpenSSH client utilities"
+	prompt   "openssh-client-utils............ OpenSSH client utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_OPENSSH_CLIENT
-	select BR2_PACKAGE_ZLIB
+	help
+	  OpenSSH is a FREE version of the SSH protocol suite of network 
+	  connectivity tools that increasing numbers of people on the Internet 
+	  are coming to rely on. Many users of telnet, rlogin, ftp, and other 
+	  such programs might not realize that their password is transmitted 
+	  across the Internet unencrypted, but it is. OpenSSH encrypts all 
+	  traffic (including passwords) to effectively eliminate eavesdropping, 
+	  connection hijacking, and other network-level attacks. Additionally, 
+	  OpenSSH provides a myriad of secure tunneling capabilities, as well 
+	  as a variety of authentication methods.
+	  
+	  http://www.openssh.com/
+	  
+	  Depends: openssl
 
 config BR2_PACKAGE_OPENSSH_SERVER
-	tristate "openssh-server - OpenSSH server"
+	prompt "openssh-server.................... OpenSSH server"
+	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_OPENSSH
+	select BR2_COMPILE_OPENSSH
 	select BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_ZLIB
+	help
+	  OpenSSH is a FREE version of the SSH protocol suite of network 
+	  connectivity tools that increasing numbers of people on the Internet 
+	  are coming to rely on. Many users of telnet, rlogin, ftp, and other 
+	  such programs might not realize that their password is transmitted 
+	  across the Internet unencrypted, but it is. OpenSSH encrypts all 
+	  traffic (including passwords) to effectively eliminate eavesdropping, 
+	  connection hijacking, and other network-level attacks. Additionally, 
+	  OpenSSH provides a myriad of secure tunneling capabilities, as well 
+	  as a variety of authentication methods.
+	  
+	  http://www.openssh.com/
+	  
+	  Depends: openssl
 
 config BR2_PACKAGE_OPENSSH_SFTP_CLIENT
-	tristate "openssh-sftp-client - OpenSSH SFTP client"
+	prompt "openssh-sftp-client............... OpenSSH SFTP client"
+	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_OPENSSH
+	select BR2_COMPILE_OPENSSH
 	select BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_ZLIB
+	help
+	  OpenSSH is a FREE version of the SSH protocol suite of network 
+	  connectivity tools that increasing numbers of people on the Internet 
+	  are coming to rely on. Many users of telnet, rlogin, ftp, and other 
+	  such programs might not realize that their password is transmitted 
+	  across the Internet unencrypted, but it is. OpenSSH encrypts all 
+	  traffic (including passwords) to effectively eliminate eavesdropping, 
+	  connection hijacking, and other network-level attacks. Additionally, 
+	  OpenSSH provides a myriad of secure tunneling capabilities, as well 
+	  as a variety of authentication methods.
+	  
+	  http://www.openssh.com/
+	  
+	  Depends: openssl
+
 
 config BR2_PACKAGE_OPENSSH_SFTP_SERVER
-	tristate "openssh-sftp-server - OpenSSH SFTP server"
+	prompt "openssh-sftp-server............... OpenSSH SFTP server"
+	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_OPENSSH
+	select BR2_COMPILE_OPENSSH
 	select BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_ZLIB
+	help
+	  OpenSSH is a FREE version of the SSH protocol suite of network 
+	  connectivity tools that increasing numbers of people on the Internet 
+	  are coming to rely on. Many users of telnet, rlogin, ftp, and other 
+	  such programs might not realize that their password is transmitted 
+	  across the Internet unencrypted, but it is. OpenSSH encrypts all 
+	  traffic (including passwords) to effectively eliminate eavesdropping, 
+	  connection hijacking, and other network-level attacks. Additionally, 
+	  OpenSSH provides a myriad of secure tunneling capabilities, as well 
+	  as a variety of authentication methods.
+	  
+	  http://www.openssh.com/
+	  
+	  Depends: openssl
 
 endmenu
-
diff --git a/openwrt/package/openssl/Config.in b/openwrt/package/openssl/Config.in
index 61c0953a1..73c8e6744 100644
--- a/openwrt/package/openssl/Config.in
+++ b/openwrt/package/openssl/Config.in
@@ -1,10 +1,10 @@
-config BR2_PACKAGE_OPENSSL
+config BR2_COMPILE_OPENSSL
 	bool
 	default n
 	depends BR2_PACKAGE_LIBOPENSSL
 	
 config BR2_PACKAGE_LIBOPENSSL
-	prompt "libopenssl - Open source SSL (Secure Socket Layer) libraries"
+	prompt "libopenssl........................ Open source SSL (Secure Socket Layer) libraries"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_OPENSSL
@@ -18,13 +18,12 @@ config BR2_PACKAGE_LIBOPENSSL
 	  http://www.openssl.org/
 	  
 	  This package contains the shared SSL libraries, needed by other programs.
-	  
 
 config BR2_PACKAGE_OPENSSL_UTIL
-	depends BR2_PACKAGE_LIBOPENSSL
-	prompt "openssl-util - OpenSSL command line tool"
+	prompt   "openssl-util.................... OpenSSL command line tool"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_LIBOPENSSL
 	help
 	  	
 	  The OpenSSL Project is a collaborative effort to develop a robust, 
@@ -35,4 +34,4 @@ config BR2_PACKAGE_OPENSSL_UTIL
 	  http://www.openssl.org/
 	  
 	  This package contains the multi-purpose OpenSSL binary tool.
-	  
+
diff --git a/openwrt/package/openswan/Config.in b/openwrt/package/openswan/Config.in
index 3c4e18536..0a1b42e00 100644
--- a/openwrt/package/openswan/Config.in
+++ b/openwrt/package/openswan/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_OPENSWAN
-	tristate "Openswan - VPN solution using IPsec"
+	prompt "openswan.......................... VPN solution using IPsec"
+	tristate
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBGMP
 	select BR2_PACKAGE_KMOD_OPENSWAN
-	default m if CONFIG_DEVEL
 	help
 	  Openswan is an implementation of IPsec for Linux.
 	  
 	  http://www.openswan.org/
-	  
 
diff --git a/openwrt/package/openvpn/Config.in b/openwrt/package/openvpn/Config.in
index 12c35ba79..6117a8e99 100644
--- a/openwrt/package/openvpn/Config.in
+++ b/openwrt/package/openvpn/Config.in
@@ -1,5 +1,8 @@
+menu "openvpn........................... Open source VPN solution using SSL"
+
 config BR2_PACKAGE_OPENVPN
-	tristate "openvpn - Open source VPN solution using SSL"
+	prompt "openvpn........................... Open source VPN solution using SSL"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_TUN
 	select BR2_PACKAGE_LIBOPENSSL
@@ -9,20 +12,24 @@ config BR2_PACKAGE_OPENVPN
 	  http://openvpn.net/
 	  
 	  Depends: kmod-tun, libpthread, openssl
-	  
 
-config BR2_PACKAGE_OPENVPN_SERVER
-	bool "Enable server support"
+config BR2_COMPILE_OPENVPN_WITH_SERVER
+	prompt "Enable server support"
+	bool
 	default y
 	depends BR2_PACKAGE_OPENVPN
 
-config BR2_PACKAGE_OPENVPN_HTTP
-	bool "Enable http proxy support"
+config BR2_COMPILE_OPENVPN_WITH_HTTP
+	prompt "Enable http proxy support"
+	bool
 	default y
 	depends BR2_PACKAGE_OPENVPN
 
-config BR2_PACKAGE_OPENVPN_LZO
-	bool "Enable transparent compression (lzo)"
+config BR2_COMPILE_OPENVPN_WITH_LZO
+	prompt "Enable transparent compression (lzo)"
+	bool
 	default y
 	depends BR2_PACKAGE_OPENVPN
 	select BR2_PACKAGE_LIBLZO
+
+endmenu
diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index d7ae22eec..e2589e0fd 100644
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -19,16 +19,16 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 PKG_DEPEND:="libopenssl, kmod-tun"
-ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y)
 DISABLE_LZO:=--disable-lzo
 else
 PKG_DEPEND+=", liblzo"
 endif
 
-ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_SERVER),y)
 DISABLE_SERVER:=--disable-server
 endif
-ifneq ($(BR2_PACKAGE_OPENVPN_HTTP),y)
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_HTTP),y)
 DISABLE_HTTP:=--disable-http
 endif
 
diff --git a/openwrt/package/osiris/Config.in b/openwrt/package/osiris/Config.in
index d2036e6d1..9a3d0a470 100644
--- a/openwrt/package/osiris/Config.in
+++ b/openwrt/package/osiris/Config.in
@@ -1,12 +1,13 @@
-config BR2_PACKAGE_OSIRIS
+config BR2_COMPILE_OSIRIS
 	bool
 	default n
 	depends BR2_PACKAGE_OSIRISD
 
 config BR2_PACKAGE_OSIRISD
-	tristate "osirisd - Host integrity monitoring system (scanning agent)"
+	prompt "osirisd........................... Host integrity monitoring system (scanning agent)"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_OSIRIS
+	select BR2_COMPILE_OSIRIS
 	select BR2_PACKAGE_LIBOPENSSL
 	help
 	  An host integrity monitoring system (scanning agent)
@@ -14,5 +15,4 @@ config BR2_PACKAGE_OSIRISD
 	  http://www.hostintegrity.com/osiris/
 	  
 	  Depends: openssl
-	  
 
diff --git a/openwrt/package/p910nd/Config.in b/openwrt/package/p910nd/Config.in
index 732e15a11..a94d030b1 100644
--- a/openwrt/package/p910nd/Config.in
+++ b/openwrt/package/p910nd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_P910ND
-	tristate "p910nd - A small non-spooling printer server"
+	prompt "p910nd............................ A small non-spooling printer server"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  p910nd  is a small daemon that copies any data received on
@@ -11,4 +12,4 @@ config BR2_PACKAGE_P910ND
 	  default is port 9100 to /dev/lp0.
 	  
 	  http://www.etherboot.org/p910nd/
-	  
+
diff --git a/openwrt/package/palantir/Config.in b/openwrt/package/palantir/Config.in
index 09f65267b..dc99d095e 100644
--- a/openwrt/package/palantir/Config.in
+++ b/openwrt/package/palantir/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PALANTIR
-	tristate "palantir - a multichannel interactive streaming solution"
+	prompt "palantir.......................... A multichannel interactive streaming solution"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBJPEG
 	help
@@ -8,4 +9,4 @@ config BR2_PACKAGE_PALANTIR
 	  remote devices.
 	  
 	  http://www.fastpath.it/products/palantir/
-	  
+
diff --git a/openwrt/package/parprouted/Config.in b/openwrt/package/parprouted/Config.in
index dfd51ecdd..edf476031 100644
--- a/openwrt/package/parprouted/Config.in
+++ b/openwrt/package/parprouted/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PARPROUTED
-	tristate "parprouted - Proxy ARP daemon"
+	prompt "parprouted........................ Proxy ARP daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  parprouted is a daemon for transparent IP (Layer 3) proxy ARP bridging.
@@ -8,3 +9,5 @@ config BR2_PACKAGE_PARPROUTED
 	  bridging allows to bridge Ethernet networks behind wireless nodes without 
 	  using WDS or layer 2 bridging.
 	  
+	  http://www.hazard.maks.net/
+
diff --git a/openwrt/package/pcre/Config.in b/openwrt/package/pcre/Config.in
index 1e880e31c..dcbcfae58 100644
--- a/openwrt/package/pcre/Config.in
+++ b/openwrt/package/pcre/Config.in
@@ -1,13 +1,15 @@
+config BR2_COMPILE_PCRE
+	bool
+	default n
+	depends BR2_PACKAGE_LIBPCRE
+
 config BR2_PACKAGE_LIBPCRE
-	tristate "libpcre - a Perl Compatible Regular Expression library"
+	prompt "libpcre........................... A Perl Compatible Regular Expression library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_PCRE
 	help
 	  A Perl Compatible Regular Expression library
 	  
 	  http://www.pcre.org/
-	  
-
-config BR2_PACKAGE_PCRE
-	tristate
-	default BR2_PACKAGE_LIBPCRE
 
diff --git a/openwrt/package/php4/Config.in b/openwrt/package/php4/Config.in
index 47e520fc2..434b1f341 100644
--- a/openwrt/package/php4/Config.in
+++ b/openwrt/package/php4/Config.in
@@ -1,14 +1,14 @@
-menu "php4 - PHP4 Hypertext preprocessor"
+menu "php4.............................. PHP4 Hypertext preprocessor"
 
 config BR2_COMPILE_PHP4
 	bool
-	default n
+	default y
 	depends BR2_PACKAGE_PHP4_CLI || BR2_PACKAGE_PHP4_CGI || BR2_PACKAGE_PHP4_FASTCGI
 	 
-comment "Server API --"
+comment "Server API ---"
 
 config BR2_PACKAGE_PHP4_CLI
-	prompt "...-cli - PHP4 CLI (Command Line Interface)"
+	prompt "php4-cli.......................... PHP4 CLI (Command Line Interface)"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_PHP4
@@ -21,7 +21,7 @@ config BR2_PACKAGE_PHP4_CLI
 	 http://www.php.net/
 
 config BR2_PACKAGE_PHP4_CGI
-	prompt "...-cgi - PHP4 built for CGI"
+	prompt "php4-cgi.......................... PHP4 built for CGI"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_PHP4
@@ -34,7 +34,7 @@ config BR2_PACKAGE_PHP4_CGI
 	 http://www.php.net/
 
 config BR2_PACKAGE_PHP4_FASTCGI
-	prompt "...-fastcgi - PHP4 built for FastCGI"
+	prompt "php4-fastcgi...................... PHP4 built for FastCGI"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_PHP4
@@ -46,23 +46,23 @@ config BR2_PACKAGE_PHP4_FASTCGI
 	 
 	 http://www.php.net/
 
-comment "Extensions --"
+comment "Extensions ---"
 
 config BR2_PACKAGE_PHP4_MOD_CURL
-	prompt "...-mod-curl - cURL module"
+	prompt "php4-mod-curl..................... cURL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBCURL
 
 config BR2_PACKAGE_PHP4_MOD_FTP
-	prompt "...-mod-ftp - FTP module"
+	prompt "php4-mod-ftp...................... FTP module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 
 config BR2_PACKAGE_PHP4_MOD_GD
-	prompt "...-mod-gd - GD graphics library module"
+	prompt "php4-mod-gd....................... GD graphics library module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
@@ -70,68 +70,68 @@ config BR2_PACKAGE_PHP4_MOD_GD
 	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_PHP4_MOD_GMP
-	prompt "...-mod-gmp - GMP module"
+	prompt "php4-mod-gmp...................... GMP module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBGMP
 
 config BR2_PACKAGE_PHP4_MOD_LDAP
-	prompt "...-mod-ldap - LDAP module"
+	prompt "php4-mod-ldap..................... LDAP module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBOPENLDAP
 
 config BR2_PACKAGE_PHP4_MOD_MYSQL
-	prompt "...-mod-mysql - MySQL module"
+	prompt "php4-mod-mysql.................... MySQL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 
 config BR2_PACKAGE_PHP4_MOD_OPENSSL
-	prompt "...-mod-openssl - OpenSSL module"
+	prompt "php4-mod-openssl.................. OpenSSL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBOPENSSL
 
 config BR2_PACKAGE_PHP4_MOD_PCRE
-	prompt "...-mod-pcre - PCRE module"
+	prompt "php4-mod-pcre..................... PCRE module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBPCRE
 
 config BR2_PACKAGE_PHP4_MOD_PGSQL
-	prompt "...-mod-pgsql - PostgreSQL module"
+	prompt "php4-mod-pgsql.................... PostgreSQL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBPQ
 
 config BR2_PACKAGE_PHP4_MOD_SESSION
-	prompt "...-mod-session - Sessions module"
+	prompt "php4-mod-session.................. Sessions module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 
 config BR2_PACKAGE_PHP4_MOD_SQLITE
-	prompt "...-mod-sqlite - SQLite module"
+	prompt "php4-mod-sqlite................... SQLite module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 	select BR2_PACKAGE_LIBSQLITE2
 
 config BR2_PACKAGE_PHP4_MOD_SOCKETS
-	prompt "...-mod-sockets - Sockets module"
+	prompt "php4-mod-sockets.................. Sockets module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
 
 config BR2_PACKAGE_PHP4_MOD_XML
-	prompt "...-mod-xml - XML module"
+	prompt "php4-mod-xml...................... XML module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP4
diff --git a/openwrt/package/php5/Config.in b/openwrt/package/php5/Config.in
index f3a8e1e8e..cae12e4d4 100644
--- a/openwrt/package/php5/Config.in
+++ b/openwrt/package/php5/Config.in
@@ -1,14 +1,14 @@
-menu "php5 - PHP5 Hypertext preprocessor"
+menu "php5.............................. PHP5 Hypertext preprocessor"
 
 config BR2_COMPILE_PHP5
 	bool
 	default n
 	depends BR2_PACKAGE_PHP5_CLI || BR2_PACKAGE_PHP5_CGI || BR2_PACKAGE_PHP5_FASTCGI
 	 
-comment "Server API --"
+comment "Server API ---"
 
 config BR2_PACKAGE_PHP5_CLI
-	prompt "...-cli - PHP5 CLI (Command Line Interface)"
+	prompt "php5-cli.......................... PHP5 CLI (Command Line Interface)"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_PHP5
@@ -21,7 +21,7 @@ config BR2_PACKAGE_PHP5_CLI
 	 http://www.php.net/
 
 config BR2_PACKAGE_PHP5_CGI
-	prompt "...-cgi - PHP5 built for CGI"
+	prompt "php5-cgi.......................... PHP5 built for CGI"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_PHP5
@@ -34,7 +34,7 @@ config BR2_PACKAGE_PHP5_CGI
 	 http://www.php.net/
 
 config BR2_PACKAGE_PHP5_FASTCGI
-	prompt "...-fastcgi - PHP5 built for FastCGI"
+	prompt "php5-fastcgi...................... PHP5 built for FastCGI"
 	tristate 
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_PHP5
@@ -46,23 +46,23 @@ config BR2_PACKAGE_PHP5_FASTCGI
 	 
 	 http://www.php.net/
 
-comment "Extensions --"
+comment "Extensions ---"
 
 config BR2_PACKAGE_PHP5_MOD_CURL
-	prompt "...-mod-curl - cURL module"
+	prompt "php5-mod-curl..................... cURL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBCURL
 
 config BR2_PACKAGE_PHP5_MOD_FTP
-	prompt "...-mod-ftp - FTP module"
+	prompt "php5-mod-ftp...................... FTP module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 
 config BR2_PACKAGE_PHP5_MOD_GD
-	prompt "...-mod-gd - GD graphics library module"
+	prompt "php5-mod-gd....................... GD graphics library module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
@@ -70,68 +70,68 @@ config BR2_PACKAGE_PHP5_MOD_GD
 	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_PHP5_MOD_GMP
-	prompt "...-mod-gmp - GMP module"
+	prompt "php5-mod-gmp...................... GMP module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBGMP
 
 config BR2_PACKAGE_PHP5_MOD_LDAP
-	prompt "...-mod-ldap - LDAP module"
+	prompt "php5-mod-ldap..................... LDAP module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBOPENLDAP
 
 config BR2_PACKAGE_PHP5_MOD_MYSQL
-	prompt "...-mod-mysql - MySQL module"
+	prompt "php5-mod-mysql.................... MySQL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 
 config BR2_PACKAGE_PHP5_MOD_OPENSSL
-	prompt "...-mod-openssl - OpenSSL module"
+	prompt "php5-mod-openssl.................. OpenSSL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBOPENSSL
 
 config BR2_PACKAGE_PHP5_MOD_PCRE
-	prompt "...-mod-pcre - PCRE module"
+	prompt "php5-mod-pcre..................... PCRE module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBPCRE
 
 config BR2_PACKAGE_PHP5_MOD_PGSQL
-	prompt "...-mod-pgsql - PostgreSQL module"
+	prompt "php5-mod-pgsql.................... PostgreSQL module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBPQ
 
 config BR2_PACKAGE_PHP5_MOD_SESSION
-	prompt "...-mod-session - Sessions module"
+	prompt "php5-mod-session.................. Sessions module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 
 config BR2_PACKAGE_PHP5_MOD_SQLITE
-	prompt "...-mod-sqlite - SQLite module"
+	prompt "php5-mod-sqlite................... SQLite module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 	select BR2_PACKAGE_LIBSQLITE2
 
 config BR2_PACKAGE_PHP5_MOD_SOCKETS
-	prompt "...-mod-sockets - Sockets module"
+	prompt "php5-mod-sockets.................. Sockets module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
 
 config BR2_PACKAGE_PHP5_MOD_XML
-	prompt "...-mod-xml - XML module"
+	prompt "php5-mod-xml...................... XML module"
 	tristate 
 	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_PHP5
diff --git a/openwrt/package/picocom/Config.in b/openwrt/package/picocom/Config.in
index 4a09710db..85ae98fc5 100644
--- a/openwrt/package/picocom/Config.in
+++ b/openwrt/package/picocom/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PICOCOM
-	tristate "picocom - minimal dumb-terminal emulation program"
+	prompt "picocom........................... minimal dumb-terminal emulation program"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  As its name suggests, picocom is a minimal dumb-terminal emulation 
@@ -11,4 +12,4 @@ config BR2_PACKAGE_PICOCOM
 	  similar tasks.
 	  
 	  http://efault.net/npat/hacks/picocom/
-	  
\ No newline at end of file
+
diff --git a/openwrt/package/pmacct/Config.in b/openwrt/package/pmacct/Config.in
index e050b4ee3..cd3966dfd 100644
--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/package/pmacct/Config.in
@@ -1,36 +1,36 @@
-menu "pmacct - IPv4/IPv6 accounting and aggregation tools"
+menu "pmacct............................ IPv4/IPv6 accounting and aggregation tools"
 
-config BR2_PACKAGE_PMACCT
+config BR2_COMPILE_PMACCT
 	bool
 	default n
-	depends BR2_PACKAGE_PMACCT_BASIC || BR2_PACKAGE_PMACCT_MYSQL || BR2_PACKAGE_PMACCT_PGSQL || BR2_PACKAGE_PMACCT_CUSTOM || BR2_PACKAGE_PMACCT_CLIENT
+	depends BR2_COMPILE_PMACCT_BASIC || BR2_COMPILE_PMACCT_MYSQL || BR2_COMPILE_PMACCT_PGSQL || BR2_COMPILE_PMACCT_CUSTOM
 
-config BR2_PACKAGE_PMACCT_BASIC
+config BR2_COMPILE_PMACCT_BASIC
 	bool
 	default n
 	depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC
-	select BR2_PACKAGE_PMACCT
+	select BR2_COMPILE_PMACCT
 
-config BR2_PACKAGE_PMACCT_MYSQL
+config BR2_COMPILE_PMACCT_MYSQL
 	bool
 	default n
 	depends BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL
-	select BR2_PACKAGE_PMACCT
+	select BR2_COMPILE_PMACCT
 
-config BR2_PACKAGE_PMACCT_PGSQL
+config BR2_COMPILE_PMACCT_PGSQL
 	bool
 	default n
 	depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
-	select BR2_PACKAGE_PMACCT
+	select BR2_COMPILE_PMACCT
 
-config BR2_PACKAGE_PMACCT_CUSTOM
+config BR2_COMPILE_PMACCT_CUSTOM
 	bool
 	default n
 	depends BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_CUSTOM
-	select BR2_PACKAGE_PMACCT
+	select BR2_COMPILE_PMACCT
 
 choice
-	prompt "nfacctd - NetFlow accounting daemon"
+	prompt   "nfacctd......................... NetFlow accounting daemon"
 	tristate
 	default m if CONFIG_DEVEL
 	optional
@@ -43,54 +43,53 @@ choice
 	  Depends:
 	    - libmysqlclient (for MySQL database logging support)
 	    - libpq (for PostgreSQL database logging support)
-	  
 	
 	config BR2_PACKAGE_NFACCTD_BASIC
-		prompt "nfacctd: without database support"
+		prompt     "nfacctd.......................   built without database support"
 		tristate
-		select BR2_PACKAGE_PMACCT_BASIC
+		select BR2_COMPILE_PMACCT_BASIC
 		select BR2_PACKAGE_LIBPCAP
 	
 	config BR2_PACKAGE_NFACCTD_MYSQL
-		prompt "nfacctd-mysql: with MySQL database support"
+		prompt     "nfacctd-mysql.................   built with MySQL database support"
 		tristate
-		select BR2_PACKAGE_PMACCT_MYSQL
+		select BR2_COMPILE_PMACCT_MYSQL
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 	
 	config BR2_PACKAGE_NFACCTD_PGSQL
-		prompt "nfacctd-pgsql: with PostgreSQL database support"
+		prompt     "nfacctd-pgsql.................   built with PostgreSQL database support"
 		tristate
-		select BR2_PACKAGE_PMACCT_PGSQL
+		select BR2_COMPILE_PMACCT_PGSQL
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPQ
 	
 	config BR2_PACKAGE_NFACCTD_CUSTOM
-		prompt "nfacctd-custom: customized to your needs"
+		prompt     "nfacctd-custom................   customized to your needs"
 		tristate
-		select BR2_PACKAGE_PMACCT_CUSTOM
+		select BR2_COMPILE_PMACCT_CUSTOM
 		select BR2_PACKAGE_LIBPCAP
 
-	config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG
+	config BR2_COMPILE_NFACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
 
-	config BR2_PACKAGE_NFACCTD_ENABLE_IPV6
+	config BR2_COMPILE_NFACCTD_ENABLE_IPV6
 		prompt "IPv6 support"
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
 
-	config BR2_PACKAGE_NFACCTD_WITH_MYSQL
+	config BR2_COMPILE_NFACCTD_WITH_MYSQL
 		prompt "MySQL database support"
 		bool
 		default n
 		depends BR2_PACKAGE_NFACCTD_CUSTOM
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 
-	config BR2_PACKAGE_NFACCTD_WITH_PGSQL
+	config BR2_COMPILE_NFACCTD_WITH_PGSQL
 		prompt "PostgreSQL database support"
 		bool
 		default n
@@ -100,7 +99,7 @@ choice
 endchoice
 
 choice
-	prompt "pmacctd - IP accounting daemon (libpcap based)"
+	prompt   "pmacctd......................... IP accounting daemon (libpcap based)"
 	tristate
 	default m if CONFIG_DEVEL
 	optional
@@ -114,55 +113,54 @@ choice
 	    - libpcap
 	    - libmysqlclient (for MySQL database logging support)
 	    - libpq (for PostgreSQL database logging support)
-	  
 	
 	
 	config BR2_PACKAGE_PMACCTD_BASIC
-		prompt "pmacctd: without database support"
+		prompt     "pmacctd.......................   built without database support"
 		tristate
-		select BR2_PACKAGE_PMACCT_BASIC
+		select BR2_COMPILE_PMACCT_BASIC
 		select BR2_PACKAGE_LIBPCAP
 
 	config BR2_PACKAGE_PMACCTD_MYSQL
-		prompt "pmacctd-mysql: with MySQL database support"
+		prompt     "pmacctd-mysql.................   built with MySQL database support"
 		tristate
-		select BR2_PACKAGE_PMACCT_MYSQL
+		select BR2_COMPILE_PMACCT_MYSQL
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 	
 	config BR2_PACKAGE_PMACCTD_PGSQL
-		prompt "pmacctd-pgsql: with PostgreSQL database support"
+		prompt     "pmacctd-pgsql.................   built with PostgreSQL database support"
 		tristate
-		select BR2_PACKAGE_PMACCT_PGSQL
+		select BR2_COMPILE_PMACCT_PGSQL
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPQ
 	
 	config BR2_PACKAGE_PMACCTD_CUSTOM
-		prompt "pmacctd-custom: customized to your needs"
+		prompt     "pmacctd-custom................   customized to your needs"
 		tristate
-		select BR2_PACKAGE_PMACCT_CUSTOM
+		select BR2_COMPILE_PMACCT_CUSTOM
 		select BR2_PACKAGE_LIBPCAP
 	
-	config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG
+	config BR2_COMPILE_PMACCTD_ENABLE_DEBUG
 		prompt "debug (enable debugging options, useful for bugreports)"
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
 
-	config BR2_PACKAGE_PMACCTD_ENABLE_IPV6
+	config BR2_COMPILE_PMACCTD_ENABLE_IPV6
 		prompt "IPv6 support"
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
 
-	config BR2_PACKAGE_PMACCTD_WITH_MYSQL
+	config BR2_COMPILE_PMACCTD_WITH_MYSQL
 		prompt "MySQL database support"
 		bool
 		default n
 		depends BR2_PACKAGE_PMACCTD_CUSTOM
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 
-	config BR2_PACKAGE_PMACCTD_WITH_PGSQL
+	config BR2_COMPILE_PMACCTD_WITH_PGSQL
 		prompt "PostgreSQL database support"
 		bool
 		default n
@@ -172,9 +170,9 @@ choice
 endchoice
 
 config BR2_PACKAGE_PMACCT_CLIENT
-	prompt "pmacct-client - Command-line client to gather data from the IMT plugin"
+	prompt   "pmacct-client................... Command-line client to gather data from the IMT plugin"
 	tristate
 	default n
-	select BR2_PACKAGE_PMACCT
+	select BR2_COMPILE_PMACCT
 
 endmenu
diff --git a/openwrt/package/popt/Config.in b/openwrt/package/popt/Config.in
index f7a617a5c..b06933ae7 100644
--- a/openwrt/package/popt/Config.in
+++ b/openwrt/package/popt/Config.in
@@ -1,13 +1,14 @@
+config BR2_COMPILE_POPT
+	bool
+	depends BR2_PACKAGE_LIBPOPT
+
 config BR2_PACKAGE_LIBPOPT
-	tristate "libpopt - Command line option parsing library"
+	prompt "libpopt........................... Command line option parsing library"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_POPT
 	help
 	  A command line option parsing library
 	  
 	  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
-	  
-
-config BR2_PACKAGE_POPT
-	tristate
-	default BR2_PACKAGE_LIBPOPT
 
diff --git a/openwrt/package/portmap/Config.in b/openwrt/package/portmap/Config.in
index b7ed5ae59..63b73789b 100644
--- a/openwrt/package/portmap/Config.in
+++ b/openwrt/package/portmap/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PORTMAP
-	tristate "portmap - RPC Portmapper"
+	prompt "portmap........................... RPC Portmapper"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  The RPC Portmapper (used by the NFS Server)
-	  
-	
\ No newline at end of file
+
diff --git a/openwrt/package/portsentry/Config.in b/openwrt/package/portsentry/Config.in
index 703713429..f7acc1853 100644
--- a/openwrt/package/portsentry/Config.in
+++ b/openwrt/package/portsentry/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_PORTSENTRY
-	tristate "portsentry - portscan protection utility"
+	prompt "portsentry........................ Portscan protection utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Software for protection against port scans
 	  
 	  http://sourceforge.net/projects/sentrytools
-	  
+
diff --git a/openwrt/package/postgresql/Config.in b/openwrt/package/postgresql/Config.in
index 3a2dc6c7b..d153ebcfe 100644
--- a/openwrt/package/postgresql/Config.in
+++ b/openwrt/package/postgresql/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_POSTGRESQL
 	depends BR2_PACKAGE_LIBPQ
 
 config BR2_PACKAGE_LIBPQ
-	prompt "libpq - PostgreSQL client library"
+	prompt "libpq............................. PostgreSQL client library"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_POSTGRESQL
@@ -30,7 +30,7 @@ config BR2_PACKAGE_LIBPQ
 	  This package contains the shared client library, needed by other programs.
 
 config BR2_PACKAGE_PGSQL_CLI
-	prompt "pgsql-cli - Command Line Interface (CLI) to PostgreSQL databases"
+	prompt   "pgsql-cli....................... Command Line Interface (CLI) to PostgreSQL databases"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBPQ
diff --git a/openwrt/package/ppp/Config.in b/openwrt/package/ppp/Config.in
index 21b7b4227..d97c34220 100644
--- a/openwrt/package/ppp/Config.in
+++ b/openwrt/package/ppp/Config.in
@@ -1,45 +1,45 @@
-menu "ppp - PPP (Point-to-Point Protocol) daemon"
+menu "ppp............................... PPP (Point-to-Point Protocol) daemon"
 
 config BR2_PACKAGE_PPP
-	prompt "ppp - PPP (Point-to-Point Protocol) daemon"
+	prompt "ppp............................... PPP (Point-to-Point Protocol) daemon"
 	tristate
 	default y
 	select BR2_PACKAGE_KMOD_PPP
 
 config BR2_PACKAGE_PPP_MOD_PPPOA
-	prompt "...-mod-pppoa - PPPoA (PPP over ATM) plugin"
+	prompt   "ppp-mod-pppoa................... PPPoA (PPP over ATM) plugin"
 	tristate
 	default y if BR2_LINUX_2_4_AR7
 	depends on BR2_PACKAGE_PPP
 	select BR2_PACKAGE_KMOD_PPPOATM
 
 config BR2_PACKAGE_PPP_MOD_PPPOE
-	prompt "...-mod-pppoe - PPPoE (PPP over Ethernet) plugin"
+	prompt   "ppp-mod-pppoe................... PPPoE (PPP over Ethernet) plugin"
 	tristate
 	default y
 	depends on BR2_PACKAGE_PPP
 	select BR2_PACKAGE_KMOD_PPPOE
 
 config BR2_PACKAGE_PPP_MOD_RADIUS
-	prompt "...-mod-radius - RADIUS (Remote Authentication Dial-In User Service) plugin"
+	prompt   "ppp-mod-radius.................. RADIUS (Remote Authentication Dial-In User Service) plugin"
 	tristate
 	default m if CONFIG_DEVEL
 	depends on BR2_PACKAGE_PPP
 
 config BR2_PACKAGE_CHAT
-	prompt "chat - Utility to establish conversation with other PPP servers (via a modem)"
+	prompt   "chat............................ Utility to establish conversation with other PPP servers (via a modem)"
 	tristate
 	default m if CONFIG_DEVEL
 	depends on BR2_PACKAGE_PPP
 
 config BR2_PACKAGE_PPPDUMP
-	prompt "pppdump - Utility to read PPP record file"
+	prompt   "pppdump......................... Utility to read PPP record file"
 	tristate
 	default m if CONFIG_DEVEL
 	depends on BR2_PACKAGE_PPP
 
 config BR2_PACKAGE_PPPSTATS
-	prompt "pppstats - Utility to report PPP statistics"
+	prompt   "pppstats........................ Utility to report PPP statistics"
 	tristate
 	default m if CONFIG_DEVEL
 	depends on BR2_PACKAGE_PPP
diff --git a/openwrt/package/pptp/Config.in b/openwrt/package/pptp/Config.in
index 905506e39..88da23748 100644
--- a/openwrt/package/pptp/Config.in
+++ b/openwrt/package/pptp/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_PPTP
-	prompt "pptp - PPTP (Point-to-Point Tunneling Protocol) client"
+	prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_GRE
@@ -8,4 +8,4 @@ config BR2_PACKAGE_PPTP
 	  A Point-to-Point Tunneling Protocol Client 
 	  
 	  http://pptpclient.sourceforge.net/
-	  
+
diff --git a/openwrt/package/pptpd/Config.in b/openwrt/package/pptpd/Config.in
index 1bb1527ed..e75d71a03 100644
--- a/openwrt/package/pptpd/Config.in
+++ b/openwrt/package/pptpd/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_PPTPD
-	prompt "pptpd - PPTP (Point-to-Point Tunneling Protocol) server"
+	prompt "pptpd............................. PPTP (Point-to-Point Tunneling Protocol) server"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_GRE
@@ -8,5 +8,4 @@ config BR2_PACKAGE_PPTPD
 	  A Point-to-Point Tunneling Protocol server
 	  
 	  http://poptop.sourceforge.net/
-	  
 
diff --git a/openwrt/package/quagga/Config.in b/openwrt/package/quagga/Config.in
index 7e893e205..758faebf3 100644
--- a/openwrt/package/quagga/Config.in
+++ b/openwrt/package/quagga/Config.in
@@ -1,7 +1,7 @@
-menu "quagga - the Quagga Software Routing Suite"
+menu "quagga............................ The Quagga Software Routing Suite"
 
 config BR2_PACKAGE_QUAGGA
-	prompt "quagga - the Quagga Software Routing Suite"
+	prompt "quagga............................ The Quagga Software Routing Suite"
 	tristate
 	default m if CONFIG_DEVEL
 	help
@@ -12,53 +12,53 @@ config BR2_PACKAGE_QUAGGA
 	  http://www.quagga.net/
 
 config BR2_PACKAGE_QUAGGA_BGPD
-	depends BR2_PACKAGE_QUAGGA
-	prompt "...-bgpd - BGPv4, BGPv4+, BGPv4- routing engine"
+	prompt   "quagga-bgpd..................... BGPv4, BGPv4+, BGPv4- routing engine"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
 	help
 	  A BGPv4, BGPv4+, BGPv4- routing engine for use with Quagga routing
 	  software.
 
 config BR2_PACKAGE_QUAGGA_OSPFD
-	depends BR2_PACKAGE_QUAGGA
-	prompt "...-ospfd - OSPFv2 routing engine"
+	prompt   "quagga-ospfd.................... OSPFv2 routing engine"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
 	help
 	  An OSPFv2 (IPv4) routing engine for use with Quagga routing software.
 
 config BR2_PACKAGE_QUAGGA_OSPF6D
-	depends BR2_PACKAGE_QUAGGA
-	prompt "...-ospf6d - OSPFv3 routing engine"
+	prompt   "quagga-ospf6d................... OSPFv3 routing engine"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
 	help
 	  An OSPFv3 (IPv6) routing engine for use with Quagga routing software.
 
 config BR2_PACKAGE_QUAGGA_RIPD
-	depends BR2_PACKAGE_QUAGGA
-	prompt "...-ripd - RIP routing engine"
+	prompt   "quagga-ripd..................... RIP routing engine"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
 	help
 	  A RIP (IPv4) routing engine for use with Quagga routing software.
 
 config BR2_PACKAGE_QUAGGA_RIPNGD
-	depends BR2_PACKAGE_QUAGGA
-	prompt "...-ripngd - RIPNG routing engine"
+	prompt   "quagga-ripngd................... RIPNG routing engine"
 	tristate
 	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_QUAGGA
 	help
 	  A RIPNG (IPv6) routing engine for use with Quagga routing software.
 
 config BR2_PACKAGE_QUAGGA_VTYSH
+	prompt   "quagga-vtysh.................... integrated shell for Quagga routing software"
+	tristate
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	select BR2_PACKAGE_LIBREADLINE
 	select BR2_PACKAGE_LIBNCURSES
-	prompt "...-vtysh - integrated shell for Quagga routing software"
-	tristate
-	default m if CONFIG_DEVEL
 	help
 	  vtysh lets you interact with all the Quagga routing daemons
 	  at once in an integrated shell.
diff --git a/openwrt/package/radvd/Config.in b/openwrt/package/radvd/Config.in
index 0923f1cb1..46bc355db 100644
--- a/openwrt/package/radvd/Config.in
+++ b/openwrt/package/radvd/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_RADVD
-	tristate "radvd - IPv6 Routing Advertisement Daemon"
+	prompt "radvd............................. IPv6 Routing Advertisement Daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_IPV6
 	help
 	  Routing Advertisement Daemon for IPv6
 	  
 	  http://v6web.litech.org/radvd/
-	  
+
diff --git a/openwrt/package/rarpd/Config.in b/openwrt/package/rarpd/Config.in
index d64cd56f3..648866938 100644
--- a/openwrt/package/rarpd/Config.in
+++ b/openwrt/package/rarpd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_RARPD
-	tristate "rarpd - Reverse ARP Daemon"
+	prompt "rarpd............................. Reverse ARP Daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNET
 	help
@@ -10,4 +11,4 @@ config BR2_PACKAGE_RARPD
 	  database.
 	  
 	  ftp://ftp.dementia.org/pub/net-tools/
-	  
+
diff --git a/openwrt/package/readline/Config.in b/openwrt/package/readline/Config.in
index 2aeb4581f..deca0d644 100644
--- a/openwrt/package/readline/Config.in
+++ b/openwrt/package/readline/Config.in
@@ -4,7 +4,8 @@ config BR2_COMPILE_READLINE
 	depends BR2_PACKAGE_LIBREADLINE
 
 config BR2_PACKAGE_LIBREADLINE
-	tristate "libreadline - Command lines edition library"
+	prompt "libreadline....................... Command lines edition library"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_READLINE
 	help
@@ -16,4 +17,4 @@ config BR2_PACKAGE_LIBREADLINE
 	  history expansion on previous commands.
 	  
 	  http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-	  
+
diff --git a/openwrt/package/reaim/Config.in b/openwrt/package/reaim/Config.in
index 0fb2e76d4..02cda070d 100644
--- a/openwrt/package/reaim/Config.in
+++ b/openwrt/package/reaim/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_REAIM
-	tristate "reaim - A transparent AIM / MSN proxy"
+	prompt "reaim............................. A transparent AIM / MSN proxy"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  ReAIM is a proxy for file transfers with MSN/AIM.
 	  
 	  http://reaim.sourceforge.net/
-	  
+
diff --git a/openwrt/package/robocfg/Config.in b/openwrt/package/robocfg/Config.in
index a142e527c..db90c8b11 100644
--- a/openwrt/package/robocfg/Config.in
+++ b/openwrt/package/robocfg/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ROBOCFG
-	tristate "robocfg - BCM5325E/536x switch configuration utility"
+	prompt "robocfg........................... BCM5325E/536x switch configuration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Broadcom BCM5325E/536x switch configuration utility
-	  
+
diff --git a/openwrt/package/rp-pppoe/Config.in b/openwrt/package/rp-pppoe/Config.in
index 19f175656..2b4d9f21b 100644
--- a/openwrt/package/rp-pppoe/Config.in
+++ b/openwrt/package/rp-pppoe/Config.in
@@ -1,4 +1,4 @@
-menu "pppoe - Roaring Penguin PPPoE (PPP over Ethernet) implementation"
+#menu "rp-pppoe.......................... Roaring Penguin PPPoE (PPP over Ethernet) implementation"
 
 config BR2_COMPILE_RP_PPPOE
 	bool
@@ -6,8 +6,8 @@ config BR2_COMPILE_RP_PPPOE
 	depends BR2_PACKAGE_PPPOE_CLIENT || BR2_PACKAGE_PPPOE_RELAY || BR2_PACKAGE_PPPOE_SERVER || BR2_PACKAGE_PPPOE_SNIFF
 
 config BR2_PACKAGE_PPPOE_CLIENT
+	prompt "pppoe-client...................... PPPoE (PPP over Ethernet) client"
 	tristate
-	prompt "pppoe-client - PPPoE (PPP over Ethernet) client"
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_RP_PPPOE
 	select BR2_PACKAGE_PPP
@@ -15,22 +15,20 @@ config BR2_PACKAGE_PPPOE_CLIENT
 	  PPPoE (PPP over Ethernet) client
 	  
 	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-	  
 
 config BR2_PACKAGE_PPPOE_RELAY
+	prompt "pppoe-relay....................... PPPoE (PPP over Ethernet) relay"
 	tristate
-	prompt "pppoe-relay - PPPoE (PPP over Ethernet) relay"
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_RP_PPPOE
 	help
 	  PPPoE (PPP over Ethernet) relay
 	  
 	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-	  
 
 config BR2_PACKAGE_PPPOE_SERVER
+	prompt "pppoe-server...................... PPPoE (PPP over Ethernet) server"
 	tristate
-	prompt "pppoe-server - PPPoE (PPP over Ethernet) server"
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_RP_PPPOE
 	select BR2_PACKAGE_PPP
@@ -38,17 +36,15 @@ config BR2_PACKAGE_PPPOE_SERVER
 	  PPPoE (PPP over Ethernet) server
 	  
 	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-	  
 
 config BR2_PACKAGE_PPPOE_SNIFF
+	prompt "pppoe-sniff....................... PPPoE (PPP over Ethernet) frame sniffer"
 	tristate
-	prompt "pppoe-sniff - PPPoE (PPP over Ethernet) frame sniffer"
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_RP_PPPOE
 	help
 	  PPPoE (PPP over Ethernet) frame sniffer
 	  
 	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-	  
 
-endmenu
+#endmenu
diff --git a/openwrt/package/rrdcollect/Config.in b/openwrt/package/rrdcollect/Config.in
index 7dad23275..62add2e96 100644
--- a/openwrt/package/rrdcollect/Config.in
+++ b/openwrt/package/rrdcollect/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_RRDCOLLECT
-	tristate "rrdcollect - Round-Robin Database (RRD) collecting daemon"
+	prompt "rrdcollect........................ Round-Robin Database (RRD) collecting daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_LIBRRD1
 	help
@@ -12,10 +13,10 @@ config BR2_PACKAGE_RRDCOLLECT
 	  http://rrdcollect.sourceforge.net/
 	  
 	  This package contains only the deamon program.
-	  
-	
+
 config BR2_PACKAGE_RRDCOLLECT_EXAMPLE
-	tristate "rrdcollect-example - Example setup for RRD collecting daemon above"
+	prompt   "rrdcollect-example.............. Example setup for RRD collecting daemon above"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_RRDCOLLECT
 	help
@@ -29,4 +30,4 @@ config BR2_PACKAGE_RRDCOLLECT_EXAMPLE
 	  
 	  This packages contains programs and configuration files to 
 	  start graphing a basic set of ressources on your router.
-	
+
diff --git a/openwrt/package/rrdtool/Config.in b/openwrt/package/rrdtool/Config.in
index 641e5585e..6993c4e0e 100644
--- a/openwrt/package/rrdtool/Config.in
+++ b/openwrt/package/rrdtool/Config.in
@@ -1,12 +1,13 @@
 config BR2_COMPILE_RRDTOOL
+	prompt "rrdtool........................... Round Robin Database (RRD) tools (v1.2.x)"
 	bool
 	default n
-	depends BR2_PACKAGE_LIBRRD
 
 config BR2_PACKAGE_LIBRRD
-	tristate "librrd - Round Robin Database (RRD) management library (v1.2.x)"
+	prompt   "librrd.......................... Round Robin Database (RRD) management library (v1.2.x)"
+	tristate
 	default n
-	select BR2_COMPILE_RRDTOOL
+	depends BR2_COMPILE_RRDTOOL
 	select BR2_PACKAGE_LIBART
 	select BR2_PACKAGE_LIBFREETYPE
 	select BR2_PACKAGE_LIBPNG
@@ -23,12 +24,13 @@ config BR2_PACKAGE_LIBRRD
 	  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 	  
 	  This package contains command line tools used to manage RRDs.
-	  
 
 config BR2_PACKAGE_RRDCGI
-	tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool (v1.2.x)"
+	prompt   "rrdcgi.......................... Round Robin Database (RRD) CGI graphing tool (v1.2.x)"
+	tristate
 	default n
-	depends BR2_PACKAGE_LIBRRD
+	depends BR2_COMPILE_RRDTOOL
+	select BR2_PACKAGE_LIBRRD
 	select BR2_PACKAGE_CGILIB
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -43,12 +45,13 @@ config BR2_PACKAGE_RRDCGI
 	  
 	  This package contains the rrdcgi tool used to create web pages containing 
 	  RRD graphs based on templates.
-	  
 
 config BR2_PACKAGE_RRDTOOL
-	tristate "rrdtool - Round Robin Database (RRD) management tools (v1.2.x)"
+	prompt   "rrdtool......................... Round Robin Database (RRD) management tools (v1.2.x)"
+	tristate
 	default n
-	depends BR2_PACKAGE_LIBRRD
+	depends BR2_COMPILE_RRDTOOL
+	select BR2_PACKAGE_LIBRRD
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
 	  display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -61,5 +64,4 @@ config BR2_PACKAGE_RRDTOOL
 	  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 	  
 	  This package contains command line tools used to manage RRDs.
-	  
 
diff --git a/openwrt/package/rrdtool1/Config.in b/openwrt/package/rrdtool1/Config.in
index 1d30f8e8e..de01aca2b 100644
--- a/openwrt/package/rrdtool1/Config.in
+++ b/openwrt/package/rrdtool1/Config.in
@@ -1,12 +1,13 @@
 config BR2_COMPILE_RRDTOOL1
+	prompt "rrdtool1.......................... Round Robin Database (RRD) tools (v1.0.x)"
 	bool
-	default n
-	depends BR2_PACKAGE_LIBRRD1
+	default y
 
 config BR2_PACKAGE_LIBRRD1
-	tristate "librrd1 - Round Robin Database (RRD) management library (v1.0.x)"
+	prompt   "librrd1......................... Round Robin Database (RRD) management library (v1.0.x)"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_COMPILE_RRDTOOL1
+	depends BR2_COMPILE_RRDTOOL1
 	select BR2_PACKAGE_ZLIB
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -24,12 +25,13 @@ config BR2_PACKAGE_LIBRRD1
 	  This is version 1.0.x with cgilib-0.4, gd1.3 and libpng-1.0.9 linked into 
 	  librrd.so. The library is much smaller compared to the 1.2.x version with 
 	  separate dynamic linked libraries.
-	  
 
 config BR2_PACKAGE_RRDCGI1
-	tristate "rrdcgi1 - Round Robin Database (RRD) CGI graphing tool (v1.0.x)"
+	prompt   "rrdcgi1......................... Round Robin Database (RRD) CGI graphing tool (v1.0.x)"
+	tristate
 	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBRRD1
+	depends BR2_COMPILE_RRDTOOL1
+	select BR2_PACKAGE_LIBRRD1
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
 	  display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -47,12 +49,12 @@ config BR2_PACKAGE_RRDCGI1
 	  This is version 1.0.x with cgilib-0.4, gd1.3 and libpng-1.0.9 linked into 
 	  librrd.so. The library is much smaller compared to the 1.2.x version with 
 	  separate dynamic linked libraries.
-	  
 
 config BR2_PACKAGE_RRDTOOL1
-	tristate "rrdtool1 - Round Robin Database (RRD) management tools (v1.0.x)"
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBRRD1
+	prompt   "rrdtool1........................ Round Robin Database (RRD) management tools (v1.0.x)"
+	tristate
+	depends BR2_COMPILE_RRDTOOL1
+	select BR2_PACKAGE_LIBRRD1
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
 	  display time-series data (i.e. network bandwidth, machine-room temperature,
diff --git a/openwrt/package/rrs/Config.in b/openwrt/package/rrs/Config.in
index 8c9ab8205..30651d1f2 100644
--- a/openwrt/package/rrs/Config.in
+++ b/openwrt/package/rrs/Config.in
@@ -1,10 +1,13 @@
+#menu "rrs............................... A reverse (connecting) remote shell"
+
 config BR2_COMPILE_RRS
 	bool
 	default n
 	depends BR2_PACKAGE_RRS || BR2_PACKAGE_RRS_NOSSL
 
 config BR2_PACKAGE_RRS
-	tristate "rrs - A reverse (connecting) remote shell, with SSL support"
+	prompt "rrs............................... A reverse (connecting) remote shell, with SSL support"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_RRS
 	select BR2_PACKAGE_UCLIBCXX
@@ -13,10 +16,10 @@ config BR2_PACKAGE_RRS
 	  A reverse (connecting) remote shell, built with SSL support.
 	  
 	  http://www.cycom.se/dl/rrs/
-	  
 
 config BR2_PACKAGE_RRS_NOSSL
-	tristate "rrs-nossl - A reverse (connecting) remote shell, without SSL support"
+	prompt "rrs-nossl......................... A reverse (connecting) remote shell, without SSL support"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_RRS
 	select BR2_PACKAGE_UCLIBCXX
@@ -24,5 +27,5 @@ config BR2_PACKAGE_RRS_NOSSL
 	  A reverse (connecting) remote shell, built without SSL support.
 	  
 	  http://www.cycom.se/dl/rrs/
-	  
 
+#endmenu
diff --git a/openwrt/package/rsync/Config.in b/openwrt/package/rsync/Config.in
index 09e8babb3..f9f02bfdb 100644
--- a/openwrt/package/rsync/Config.in
+++ b/openwrt/package/rsync/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_RSYNC
-	tristate "rsync - file transfer utility"
+	prompt "rsync............................. file transfer utility"
+	tristate
 	select BR2_PACKAGE_LIBPOPT
 	default m if CONFIG_DEVEL
 	help
+	  An utility that provides fast incremental file transfer
+	  
+	  http://rsync.samba.org
 
-	utility that provides fast incremental file transfer
-
-	http://rsync.samba.org
diff --git a/openwrt/package/sablevm-classpath/Config.in b/openwrt/package/sablevm-classpath/Config.in
index abe255771..9b57f0d78 100644
--- a/openwrt/package/sablevm-classpath/Config.in
+++ b/openwrt/package/sablevm-classpath/Config.in
@@ -1,14 +1,13 @@
-config BR2_PACKAGE_SABLEVM_CLASSPATH
-	depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH
+config BR2_COMPILE_SABLEVM_CLASSPATH
 	bool
 	default n
+	depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH
 
 config BR2_PACKAGE_LIBSABLEVM_CLASSPATH
-	depends BR2_PACKAGE_SABLEVM
-	prompt "libsablevm-classpath - Essential native libraries for Java"
+	prompt "libsablevm-classpath.............. Essential native libraries for Java"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_SABLEVM_CLASSPATH
+	select BR2_COMPILE_SABLEVM_CLASSPATH
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU project to create 
 	  free core class libraries for use with virtual machines and compilers for 
@@ -19,18 +18,16 @@ config BR2_PACKAGE_LIBSABLEVM_CLASSPATH
 	  http://www.gnu.org/software/classpath/
 	  
 	  This package contains the native shared libraries, needed by other packages.
-	  
 
 choice
-	depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH
-	prompt "sablevm-classpath - Essential classes for Java"
+	prompt   "sablevm-classpath............... Essential classes for Java"
 	tristate
+	depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH
 	optional
 
 config BR2_PACKAGE_SABLEVM_CLASSPATH_FULL
-	prompt "...-full: Full set"
+	prompt     "sablevm-classpath-full........ Full set"
 	tristate
-	default n
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU project to create 
 	  free core class libraries for use with virtual machines and compilers for 
@@ -42,11 +39,10 @@ config BR2_PACKAGE_SABLEVM_CLASSPATH_FULL
 	  
 	  This package contains the full set of Java compiled classes.
 	  It will unlikely fit on your router as-is.
-	  
+
 config BR2_PACKAGE_SABLEVM_CLASSPATH_MINI
-	prompt "...-mini: Minimal set"
+	prompt     "sablevm-classpath-mini........ Minimal set"
 	tristate
-	default m if CONFIG_DEVEL
 	help
 	  
 	  GNU Classpath, Essential Libraries for Java, is a GNU project to create 
@@ -59,5 +55,5 @@ config BR2_PACKAGE_SABLEVM_CLASSPATH_MINI
 	  
 	  This package contains only a minimal set of Java compiled classes, just 
 	  enough to run the famous "Hello World !" test program.
-	  
+
 endchoice
diff --git a/openwrt/package/sablevm/Config.in b/openwrt/package/sablevm/Config.in
index 9907cf1c1..d387b75d4 100644
--- a/openwrt/package/sablevm/Config.in
+++ b/openwrt/package/sablevm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SABLEVM
-	tristate "sablevm - A Java Virtual Machine (JVM) implementation"
+	prompt "sablevm........................... A Java Virtual Machine (JVM) implementation"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBFFI_SABLE
 	select BR2_PACKAGE_LIBLTDL
@@ -13,4 +14,4 @@ config BR2_PACKAGE_SABLEVM
 	  many robustness features that have been the object of careful design.  
 	  
 	  http://sablevm.org/
-	  
+
diff --git a/openwrt/package/samba/Config.in b/openwrt/package/samba/Config.in
index 55f0ee4a1..438221620 100644
--- a/openwrt/package/samba/Config.in
+++ b/openwrt/package/samba/Config.in
@@ -1,10 +1,13 @@
+#menu "samba............................. A NetBIOS/SMB implementation"
+
 config BR2_COMPILE_SAMBA
 	bool
 	default n
 	depends BR2_PACKAGE_SAMBA || BR2_PACKAGE_SAMBA_CLIENT || BR2_PACKAGE_SMBFS
 
 config BR2_PACKAGE_SAMBA
-	tristate "samba - NetBIOS/SMB file and print server"
+	prompt "samba............................. NetBIOS/SMB file and print server"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_SAMBA
 	help
@@ -16,10 +19,10 @@ config BR2_PACKAGE_SAMBA
 	 http://www.samba.org/
 	 
 	 This package contains the SMB file and print server daemons.
-	 
 
 config BR2_PACKAGE_SAMBA_CLIENT
-	tristate "samba-client - NetBIOS/SMB simple client"
+	prompt "samba-client...................... NetBIOS/SMB simple client"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_SAMBA
 	help
@@ -31,5 +34,5 @@ config BR2_PACKAGE_SAMBA_CLIENT
 	 http://www.samba.org/
 	 
 	 This package contains a simple command-line SMB client.
-	 
 
+#endmenu
diff --git a/openwrt/package/scdp/Config.in b/openwrt/package/scdp/Config.in
index 507cdb8f4..789a8bb8d 100644
--- a/openwrt/package/scdp/Config.in
+++ b/openwrt/package/scdp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SCDP
-	tristate "scdp - an utility to send CDP (Cisco Discovery Protocol) packets"
+	prompt "scdp.............................. An utility to send CDP (Cisco Discovery Protocol) packets"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBNET
 	help
@@ -8,4 +9,4 @@ config BR2_PACKAGE_SCDP
 	  where the host is connected.
 	  
 	  http://sourceforge.net/projects/scdp
-	  
+
diff --git a/openwrt/package/screen/Config.in b/openwrt/package/screen/Config.in
index cf33ebe7f..de25fe09b 100644
--- a/openwrt/package/screen/Config.in
+++ b/openwrt/package/screen/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_SCREEN
-	tristate "screen - Full-screen terminal window manager"
+	prompt "screen............................ Full-screen terminal window manager"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Screen is a full-screen window manager that multiplexes a physical 
 	  terminal between several processes, typically interactive shells.
 	  
 	  http://www.gnu.org/software/screen/
-	  
+
diff --git a/openwrt/package/sdk/Config.in b/openwrt/package/sdk/Config.in
index 06eed79fa..f70810ba0 100644
--- a/openwrt/package/sdk/Config.in
+++ b/openwrt/package/sdk/Config.in
@@ -6,3 +6,4 @@ config BR2_PACKAGE_SDK
 	  This is essentially a stripped-down version of the buildroot
 	  with a precompiled toolchain. It can be used to develop and
 	  test packages for OpenWrt before including them in the buildroot
+
diff --git a/openwrt/package/ser/Config.in b/openwrt/package/ser/Config.in
index ede98e5f3..21dccb7e7 100644
--- a/openwrt/package/ser/Config.in
+++ b/openwrt/package/ser/Config.in
@@ -1,7 +1,10 @@
 config BR2_PACKAGE_SER
-	tristate "SIP Express Router"
+	prompt "ser............................... SIP Express Router"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 SIP Express Router (ser) is a high-performance,
-	 configurable, free SIP server.
+	  SIP Express Router (ser) is a high-performance,
+	  configurable, free SIP server.
+	  
+	  http://www.iptel.org/ser/
 
diff --git a/openwrt/package/setpwc/Config.in b/openwrt/package/setpwc/Config.in
index 9a9d558e7..19f32c641 100644
--- a/openwrt/package/setpwc/Config.in
+++ b/openwrt/package/setpwc/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_SETPWC
-	tristate "setpwc - Philips (and compatibles) WebCams (PWC) control utility"
+	prompt "setpwc............................ Philips (and compatibles) WebCams (PWC) control utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  Philips (and compatibles) WebCams (PWC) control utility.
 	  
 	  http://www.vanheusden.com/setpwc/
-	  
+
diff --git a/openwrt/package/setserial/Config.in b/openwrt/package/setserial/Config.in
index a7edbb9e9..e13502a97 100644
--- a/openwrt/package/setserial/Config.in
+++ b/openwrt/package/setserial/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SETSERIAL
-	tristate "setserial - Serial port configuration utility"
+	prompt "setserial......................... Serial port configuration utility"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  setserial  is a program designed to set and/or report the
@@ -8,4 +9,5 @@ config BR2_PACKAGE_SETSERIAL
 	  serial port is using, and whether or not the break key should
 	  be interpreted as the Secure  Attention  Key, and so on.
 	  
+	  http://setserial.sourceforge.net/
 
diff --git a/openwrt/package/shat/Config.in b/openwrt/package/shat/Config.in
index 6e5e49216..50b226a32 100644
--- a/openwrt/package/shat/Config.in
+++ b/openwrt/package/shat/Config.in
@@ -1,7 +1,10 @@
 config BR2_PACKAGE_SHAT
-	tristate "shat - Source Hardware Address Translation"
+	prompt "shat.............................. Source Hardware Address Translation"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A tool which allows hosts with arbitrary IP configuration
 	  to connect to the internet over a SHAT gateway.
-	  
\ No newline at end of file
+	  
+	  http://www.teddy-net.com/cvs/Maxina/128gw/service/arpcatch/shat/
+
diff --git a/openwrt/package/shfs/Config.in b/openwrt/package/shfs/Config.in
index a464a4137..2ab061003 100644
--- a/openwrt/package/shfs/Config.in
+++ b/openwrt/package/shfs/Config.in
@@ -1,13 +1,13 @@
-config BR2_PACKAGE_SHFS
+config BR2_COMPILE_SHFS
 	bool
 	default n
 	depends BR2_PACKAGE_SHFS_UTILS
 
-
 config BR2_PACKAGE_SHFS_UTILS
-	select BR2_PACKAGE_KMOD_SHFS
-	prompt "shfs-utils - ShFS mount/umount utilities"
+	prompt "shfs-utils........................ ShFS mount/umount utilities"
 	tristate
+	select BR2_COMPILE_SHFS
+	select BR2_PACKAGE_KMOD_SHFS
 	default m if CONFIG_DEVEL
 	help
 	  ShFS is a simple and easy to use Linux kernel module which 
@@ -29,5 +29,4 @@ config BR2_PACKAGE_SHFS_UTILS
 	  http://shfs.sourceforge.net/
 	  
 	  This package contains the shfs mount/umount utilities.
-	  
 
diff --git a/openwrt/package/siproxd/Config.in b/openwrt/package/siproxd/Config.in
index 4baa82513..2d48badcb 100644
--- a/openwrt/package/siproxd/Config.in
+++ b/openwrt/package/siproxd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SIPROXD
-	tristate "siproxd - SIP (Session Initiation Protocol) proxy"
+	prompt "siproxd........................... SIP (Session Initiation Protocol) proxy"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOSIP2
 	help
@@ -8,4 +9,4 @@ config BR2_PACKAGE_SIPROXD
 	  http://siproxd.sourceforge.net/
 	  
 	  Depends: libosip2
-	  
+
diff --git a/openwrt/package/sipsak/Config.in b/openwrt/package/sipsak/Config.in
index 09f5b4117..dd4976cf2 100644
--- a/openwrt/package/sipsak/Config.in
+++ b/openwrt/package/sipsak/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SIPSAK
-	tristate "sipsak - SIP (Session Initiation Protocol) stress and diagnostics utility"
+	prompt "sipsak............................ SIP (Session Initiation Protocol) stress and diagnostics utility"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
 	help
@@ -8,4 +9,4 @@ config BR2_PACKAGE_SIPSAK
 	  http://www.sipsak.org/
 	  
 	  Depends: openssl
-	  
+
diff --git a/openwrt/package/snort/Config.in b/openwrt/package/snort/Config.in
index d9e840f17..4cda96898 100644
--- a/openwrt/package/snort/Config.in
+++ b/openwrt/package/snort/Config.in
@@ -1,12 +1,12 @@
-menu "snort - Ligthweight Network Intrusion Detection System (NIDS)"
+menu "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
 
-config BR2_PACKAGE_SNORT
+config BR2_COMPILE_SNORT
 	bool
-	default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
 	default n
+	depends BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM
 
 choice
-	prompt "snort - Ligthweight Network Intrusion Detection System (NIDS)"
+	prompt "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
 	tristate
 	optional
 	help
@@ -21,38 +21,37 @@ choice
 	    - libpcap
 	    - libpcre
 	    - libpq (for PostgreSQL database logging support)
-	  
 	
 	config BR2_PACKAGE_SNORT_BASIC
-		prompt "snort: without database support"
+		prompt   "snort...........................   without database support"
 		tristate
-		select BR2_PACKAGE_SNORT
+		select BR2_COMPILE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
 	
 	config BR2_PACKAGE_SNORT_MYSQL
-		prompt "snort-mysql: with MySQL database support"
+		prompt   "snort-mysql.....................   with MySQL database support"
 		tristate
-		select BR2_PACKAGE_SNORT
+		select BR2_COMPILE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
 		select BR2_PACKAGE_LIBMYSQLCLIENT
 	
 	config BR2_PACKAGE_SNORT_PGSQL
-		prompt "snort-pgsql: with PostgreSQL database support"
+		prompt   "snort-pgsql.....................   with PostgreSQL database support"
 		tristate
-		select BR2_PACKAGE_SNORT
+		select BR2_COMPILE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
 		select BR2_PACKAGE_LIBPQ
 	
 	config BR2_PACKAGE_SNORT_CUSTOM
-		prompt "snort-custom: customized to your needs"
+		prompt   "snort-custom....................   customized to your needs"
 		tristate
-		select BR2_PACKAGE_SNORT
+		select BR2_COMPILE_SNORT
 		select BR2_PACKAGE_LIBNET
 		select BR2_PACKAGE_LIBPCAP
 		select BR2_PACKAGE_LIBPCRE
@@ -64,7 +63,7 @@ choice
 		depends BR2_PACKAGE_SNORT_CUSTOM
 
 	config BR2_PACKAGE_SNORT_ENABLE_INLINE
-		prompt "inline mode (read packets from iptables instead of libpcap)"
+		prompt "Inline mode (read packets from iptables instead of libpcap)"
 		bool
 		default n
 		depends BR2_PACKAGE_SNORT_CUSTOM
diff --git a/openwrt/package/socat/Config.in b/openwrt/package/socat/Config.in
index 8552f8cfb..d66693dc1 100644
--- a/openwrt/package/socat/Config.in
+++ b/openwrt/package/socat/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SOCAT
-	tristate "socat - A multipurpose relay (SOcket CAT)"
+	prompt "socat............................. A multipurpose relay (SOcket CAT)"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_LIBPTHREAD
@@ -14,4 +15,4 @@ config BR2_PACKAGE_SOCAT
 	  http://www.dest-unreach.org/socat/
 	  
 	  Depends: openssl
-	  
+
diff --git a/openwrt/package/speex/Config.in b/openwrt/package/speex/Config.in
index a592dd6d7..800de56a7 100644
--- a/openwrt/package/speex/Config.in
+++ b/openwrt/package/speex/Config.in
@@ -1,13 +1,13 @@
-config BR2_PACKAGE_SPEEX
+config BR2_COMPILE_SPEEX
 	bool
 	default n
 	depends BR2_PACKAGE_LIBSPEEX
 
 config BR2_PACKAGE_LIBSPEEX
-	prompt "libspeex - Open source patent-free speech compression codec"
+	prompt "libspeex.......................... Open source patent-free speech compression codec"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_SPEEX
+	select BR2_COMPILE_SPEEX
 	help
 	  
 	  Speex is an Open Source/Free Software patent-free audio compression 
@@ -20,4 +20,4 @@ config BR2_PACKAGE_LIBSPEEX
 	  http://www.speex.org/
 	  
 	  This package contains the shared codec library, needed by other programs.
-	  
\ No newline at end of file
+
diff --git a/openwrt/package/sqlite/Config.in b/openwrt/package/sqlite/Config.in
index 98e134827..626c5c3dc 100644
--- a/openwrt/package/sqlite/Config.in
+++ b/openwrt/package/sqlite/Config.in
@@ -4,7 +4,7 @@ config BR2_COMPILE_SQLITE
 	depends BR2_PACKAGE_LIBSQLITE
 
 config BR2_PACKAGE_LIBSQLITE
-	prompt "libsqlite - Self-contained, embeddable, zero-configuration SQL database engine"
+	prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_SQLITE
@@ -37,9 +37,9 @@ config BR2_PACKAGE_LIBSQLITE
 	  http://www.sqlite.org/
 	  
 	  This package contains the shared library, needed by other programs.
-	  
+
 config BR2_PACKAGE_SQLITE_CLI
-	prompt "sqlite-cli - Command line interface for SQLite"
+	prompt   "sqlite-cli...................... Command line interface for SQLite"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBSQLITE
@@ -72,4 +72,4 @@ config BR2_PACKAGE_SQLITE_CLI
 	  This package contains a terminal-based front-end to the SQLite library 
 	  that can evaluate queries interactively and display the results in 
 	  multiple formats.
-	  
\ No newline at end of file
+
diff --git a/openwrt/package/sqlite2/Config.in b/openwrt/package/sqlite2/Config.in
index 7e0ad97ed..edab7b1c0 100644
--- a/openwrt/package/sqlite2/Config.in
+++ b/openwrt/package/sqlite2/Config.in
@@ -4,7 +4,7 @@ config BR2_COMPILE_SQLITE2
 	depends BR2_PACKAGE_LIBSQLITE2
 
 config BR2_PACKAGE_LIBSQLITE2
-	prompt "libsqlite2 - Self-contained, embeddable, zero-configuration SQL database engine (v2.x)"
+	prompt "libsqlite2........................ Self-contained, embeddable, zero-configuration SQL database engine (v2.x)"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_SQLITE2
@@ -37,9 +37,9 @@ config BR2_PACKAGE_LIBSQLITE2
 	  http://www.sqlite.org/
 	  
 	  This package contains the shared library, needed by other programs.
-	  
+
 config BR2_PACKAGE_SQLITE2_CLI
-	prompt "sqlite2-cli - Command line interface for SQLite (v2.x)"
+	prompt   "sqlite2-cli..................... Command line interface for SQLite (v2.x)"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBSQLITE2
@@ -72,4 +72,3 @@ config BR2_PACKAGE_SQLITE2_CLI
 	  This package contains a terminal-based front-end to the SQLite library 
 	  that can evaluate queries interactively and display the results in 
 	  multiple formats.
-	  
\ No newline at end of file
diff --git a/openwrt/package/srelay/Config.in b/openwrt/package/srelay/Config.in
index c7378ec0e..b33a47ecb 100644
--- a/openwrt/package/srelay/Config.in
+++ b/openwrt/package/srelay/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_SRELAY
-	tristate "srelay - socks 4/5 proxy server"
+	prompt "srelay............................ A socks 4/5 proxy server"
+	tristate
 	default m if CONFIG_DEVEL
 	help
+	  A socks 4/5 protocol proxy server
 	  
 	  http://www.c-wind.com/srelay/
 
diff --git a/openwrt/package/ssmtp/Config.in b/openwrt/package/ssmtp/Config.in
index 94a50bf16..a85cc090e 100644
--- a/openwrt/package/ssmtp/Config.in
+++ b/openwrt/package/ssmtp/Config.in
@@ -1,12 +1,13 @@
 config BR2_PACKAGE_SSMTP
-	tristate "ssmtp - A minimal and secure mail sender"
+	prompt "ssmtp............................. A minimal and secure mail sender"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 A secure, effective and simple way of getting mail off a system to your 
-	 mail hub. It contains no suid-binaries or other dangerous things - no 
-	 mail spool to poke around in, and no daemons running in the background. 
-	 Mail is simply forwarded to the configured mailhost. Extremely easy 
-	 configuration.
-	 
-	 http://packages.debian.org/stable/mail/ssmtp
-	 
+	  A secure, effective and simple way of getting mail off a system to your 
+	  mail hub. It contains no suid-binaries or other dangerous things - no 
+	  mail spool to poke around in, and no daemons running in the background. 
+	  Mail is simply forwarded to the configured mailhost. Extremely easy 
+	  configuration.
+	  
+	  http://packages.debian.org/stable/mail/ssmtp
+
diff --git a/openwrt/package/strace/Config.in b/openwrt/package/strace/Config.in
index 08fedf795..708e41aba 100644
--- a/openwrt/package/strace/Config.in
+++ b/openwrt/package/strace/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_STRACE
-	tristate "strace - System call tracer"
+	prompt "strace............................ System call tracer"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A useful diagnostic, instructional, and debugging tool.
@@ -7,4 +8,4 @@ config BR2_PACKAGE_STRACE
 	  while it is running.
 	  
 	  http://sourceforge.net/projects/strace/
-	  
+
diff --git a/openwrt/package/tcp_wrappers/Config.in b/openwrt/package/tcp_wrappers/Config.in
index d737fcf96..455a9bc87 100644
--- a/openwrt/package/tcp_wrappers/Config.in
+++ b/openwrt/package/tcp_wrappers/Config.in
@@ -1,13 +1,15 @@
+config BR2_COMPILE_TCP_WRAPPERS
+	bool
+	default n
+	depends BR2_PACKAGE_LIBWRAP
+
 config BR2_PACKAGE_LIBWRAP
-	tristate "libwrap - Security wrapper library for TCP services"
+	prompt "libwrap........................... Security wrapper library for TCP services"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_TCP_WRAPPERS
 	help
 	  Security wrapper library for TCP services.
 	  
 	  ftp://ftp.porcupine.org/pub/security/index.html
-	  
-
-config BR2_PACKAGE_TCP_WRAPPERS
-	tristate
-	default BR2_PACKAGE_LIBWRAP
 
diff --git a/openwrt/package/tcpdump/Config.in b/openwrt/package/tcpdump/Config.in
index 46d60b5c2..1e32c604f 100644
--- a/openwrt/package/tcpdump/Config.in
+++ b/openwrt/package/tcpdump/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_TCPDUMP
-	tristate "tcpdump - Network monitoring and data acquisition tool"
+	prompt "tcpdump........................... Network monitoring and data acquisition tool"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBPCAP
 	help
 	  A tool for network monitoring and data acquisition.
 	  
 	  http://www.tcpdump.org/
-	  
+
diff --git a/openwrt/package/tinc/Config.in b/openwrt/package/tinc/Config.in
index 6bcb658a8..59c245fe1 100644
--- a/openwrt/package/tinc/Config.in
+++ b/openwrt/package/tinc/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TINC
-	tristate "tinc - VPN tunneling daemon"
+	prompt "tinc.............................. VPN tunneling daemon"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_TUN
 	select BR2_PACKAGE_LIBLZO
@@ -9,3 +10,4 @@ config BR2_PACKAGE_TINC
 	  A VPN tunneling daemon
 	  
 	  http://www.tinc-vpn.org/
+
diff --git a/openwrt/package/tor/Config.in b/openwrt/package/tor/Config.in
index 79cc0cfac..aa0ac5c9d 100644
--- a/openwrt/package/tor/Config.in
+++ b/openwrt/package/tor/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TOR
-	tristate "tor - An anonymous Internet communication system"
+	prompt "tor............................... An anonymous Internet communication system"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBEVENT
 	select BR2_PACKAGE_LIBOPENSSL
@@ -14,4 +15,4 @@ config BR2_PACKAGE_TOR
 	  and privacy features.
 	  
 	  http://tor.eff.org/
-	  
+
diff --git a/openwrt/package/ttcp/Config.in b/openwrt/package/ttcp/Config.in
index 4c83b515f..d4b81a198 100644
--- a/openwrt/package/ttcp/Config.in
+++ b/openwrt/package/ttcp/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_TTCP
-	tristate "ttcp - TCP connection performance tester"
+	prompt "ttcp.............................. A TCP connection performance tester"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A small utility to test TCP connection performance
+
diff --git a/openwrt/package/uclibc++/Config.in b/openwrt/package/uclibc++/Config.in
index a8376a16d..48c5b6b47 100644
--- a/openwrt/package/uclibc++/Config.in
+++ b/openwrt/package/uclibc++/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_UCLIBCXX
-	tristate "uClibc++ - C++ library for embedded systems"
+	prompt "uClibc++.......................... C++ library for embedded systems"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A standard C++ library for embedded systems
+
diff --git a/openwrt/package/ulogd/Config.in b/openwrt/package/ulogd/Config.in
index 313b3609c..9de94501f 100644
--- a/openwrt/package/ulogd/Config.in
+++ b/openwrt/package/ulogd/Config.in
@@ -1,26 +1,24 @@
-menu "ulogd - Netfilter userspace logging daemon"
+menu "ulogd............................. Netfilter userspace logging daemon"
 
 config BR2_PACKAGE_ULOGD
-	prompt "ulogd - Netfilter userspace logging daemon"
+	prompt "ulogd............................. Netfilter userspace logging daemon"
 	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_IPTABLES
 	help
-	  
 	  The netfilter userspace logging daemon
 	  
 	  http://gnumonks.org/projects/ulogd
-	  
 
 config BR2_PACKAGE_ULOGD_MOD_MYSQL
-	prompt "...-mod-mysql - Output plugin for logging into a MySQL database"
+	prompt   "ulogd-mod-mysql................. Output plugin for logging into a MySQL database"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ULOGD
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 
 config BR2_PACKAGE_ULOGD_MOD_PGSQL
-	prompt "...-mod-pgsql - Output plugin for logging into a PostgreSQL database"
+	prompt   "ulogd-mod-pgsql................. Output plugin for logging into a PostgreSQL database"
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ULOGD
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control b/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control
index 3666d878a..3556bb155 100644
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control
+++ b/openwrt/package/ulogd/ipkg/ulogd-mod-mysql.control
@@ -1,4 +1,4 @@
-Package: ulogd-mysql-plugin
+Package: ulogd-mod-mysql
 Priority: optional
 Section: net
 Description: Netfilter userspace logging daemon (MySQL plugin)
diff --git a/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control b/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control
index d052ec371..dbc97765d 100644
--- a/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control
+++ b/openwrt/package/ulogd/ipkg/ulogd-mod-pgsql.control
@@ -1,4 +1,4 @@
-Package: ulogd-pgsql-plugin
+Package: ulogd-mod-pgsql
 Priority: optional
 Section: net
 Description: Netfilter userspace logging daemon (PostgreSQL plugin)
diff --git a/openwrt/package/updatedd/Config.in b/openwrt/package/updatedd/Config.in
index 086202189..77bda5e19 100644
--- a/openwrt/package/updatedd/Config.in
+++ b/openwrt/package/updatedd/Config.in
@@ -1,45 +1,73 @@
+menu "updatedd.......................... A tool to update dynamic dns services"
+
 config BR2_PACKAGE_UPDATEDD
-        tristate "updatedd - a tool to update dynamic dns services"
-        default m if CONFIG_DEVEL
-        help
-		Updatedd is a small tool that will update one of many dynamic
-		dns services on boot. Please look at the /etc/init.d/S50ddns
-		script for more info.
+	prompt "updatedd.......................... A tool to update dynamic DNS services"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	  Updatedd is a small tool that will update one of many dynamic
+	  dns services on boot.
+	  
+	  Please look at the /etc/init.d/S50ddns script for more info.
+	  
+	  http://www.philipp-benner.de/updatedd/
 
+if BR2_PACKAGE_UPDATEDD
+comment          "Plugin                           Dynamic DNS service"
+endif
 
-config BR2_PACKAGE_UPDATEDD_CHANGEIP
-	bool "changeip.com"
+config BR2_PACKAGE_UPDATEDD_MOD_CHANGEIP
+	prompt   "updatedd-mod-changeip........... changeip.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_DYNDNS
-	bool "dyndns.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_DYNDNS
+	prompt   "updatedd-mod-dyndns............. dyndns.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_EURODYNDNS
-	bool "eurodyndns.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_EURODYNDNS
+	prompt   "updatedd-mod-eurodyndns......... eurodyndns.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_HN
-	bool "hn.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_HN
+	prompt   "updatedd-mod-hn................. hn.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_NOIP
-	bool "no-ip.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_NOIP
+	prompt   "updatedd-mod-noip............... no-ip.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_ODS
-	bool "ods.org"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_ODS
+	prompt   "updatedd-mod-ods................ ods.org"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_OVH
-	bool "ovh.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_OVH
+	prompt   "updatedd-mod-ovh................ ovh.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_REGFISH
-	bool "regfish.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_REGFISH
+	prompt   "updatedd-mod-regfish............ regfish.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
-config BR2_PACKAGE_UPDATEDD_TZO
-	bool "tzo.com"
+	default m if CONFIG_DEVEL
+
+config BR2_PACKAGE_UPDATEDD_MOD_TZO
+	prompt   "updatedd-mod-tzo................ tzo.com"
+	tristate
 	depends on BR2_PACKAGE_UPDATEDD
-	default y if CONFIG_DEVEL
+	default m if CONFIG_DEVEL
+
+endmenu
diff --git a/openwrt/package/updatedd/Makefile b/openwrt/package/updatedd/Makefile
index 1279015fb..cc88b5a61 100644
--- a/openwrt/package/updatedd/Makefile
+++ b/openwrt/package/updatedd/Makefile
@@ -16,7 +16,36 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
+define PKG_mod_template
+
+$$(IPKG_$(1)):
+	install -d -m0755 $$(IDIR_$(1))/usr/lib/updatedd
+	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/updatedd/$(2).so $$(IDIR_$(1))/usr/lib/updatedd/
+	$(RSTRIP) $$(IDIR_$(1))
+	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+
+endef
+
 $(eval $(call PKG_template,UPDATEDD,updatedd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_CHANGEIP,changeip))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_DYNDNS,dyndns))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_EURODYNDNS,eurodyndns))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_HN,hn))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_NOIP,noip))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_ODS,ods))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_OVH,ovh))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_REGFISH,regfish))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_TZO,tzo))
 
 $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); \
@@ -42,41 +71,10 @@ $(PKG_BUILD_DIR)/.built:
 	touch $@
 
 $(IPKG_UPDATEDD):
+	install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d
+	install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/
 	install -d -m0755 $(IDIR_UPDATEDD)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/updatedd
-
-	install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d/
-	install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/S55ddns
-
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/
 	install -d -m0755 $(IDIR_UPDATEDD)/usr/lib/updatedd
-
-ifeq ($(BR2_PACKAGE_UPDATEDD_CHANGEIP),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/changeip.so $(IDIR_UPDATEDD)/usr/lib/updatedd/changeip.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_DYNDNS),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/dyndns.so $(IDIR_UPDATEDD)/usr/lib/updatedd/dyndns.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_EURODYNDNS),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/eurodyndns.so $(IDIR_UPDATEDD)/usr/lib/updatedd/eurodyndns.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_HN),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/hn.so $(IDIR_UPDATEDD)/usr/lib/updatedd/hn.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_NOIP),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/noip.so $(IDIR_UPDATEDD)/usr/lib/updatedd/noip.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_ODS),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/ods.so $(IDIR_UPDATEDD)/usr/lib/updatedd/ods.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_OVH),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/ovh.so $(IDIR_UPDATEDD)/usr/lib/updatedd/ovh.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_REGFISH),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/regfish.so $(IDIR_UPDATEDD)/usr/lib/updatedd/regfish.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_TZO),y)
-	install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/tzo.so $(IDIR_UPDATEDD)/usr/lib/updatedd/tzo.so
-endif
-
 	$(RSTRIP) $(IDIR_UPDATEDD)
 	$(IPKG_BUILD) $(IDIR_UPDATEDD) $(PACKAGE_DIR)
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-changeip.control b/openwrt/package/updatedd/ipkg/updatedd-mod-changeip.control
new file mode 100644
index 000000000..986752b77
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-changeip.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-changeip
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for changeip.com dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-dyndns.control b/openwrt/package/updatedd/ipkg/updatedd-mod-dyndns.control
new file mode 100644
index 000000000..93c62fd47
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-dyndns.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-dyndns
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for dyndns.org dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-eurodyndns.control b/openwrt/package/updatedd/ipkg/updatedd-mod-eurodyndns.control
new file mode 100644
index 000000000..f29e59810
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-eurodyndns.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-eurodyndns
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for eurodyndns.org dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-hn.control b/openwrt/package/updatedd/ipkg/updatedd-mod-hn.control
new file mode 100644
index 000000000..d5b57c076
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-hn.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-hn
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for hn.org dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-noip.control b/openwrt/package/updatedd/ipkg/updatedd-mod-noip.control
new file mode 100644
index 000000000..925bd7685
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-noip.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-noip
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for no-ip.org dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-ods.control b/openwrt/package/updatedd/ipkg/updatedd-mod-ods.control
new file mode 100644
index 000000000..e47b4a6e3
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-ods.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-ods
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for ods.org dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-ovh.control b/openwrt/package/updatedd/ipkg/updatedd-mod-ovh.control
new file mode 100644
index 000000000..d1eb9f219
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-ovh.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-ovh
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for ovh.com dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-regfish.control b/openwrt/package/updatedd/ipkg/updatedd-mod-regfish.control
new file mode 100644
index 000000000..f17fffe87
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-regfish.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-regfish
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for regfish.com dynamic DNS service.
diff --git a/openwrt/package/updatedd/ipkg/updatedd-mod-tzo.control b/openwrt/package/updatedd/ipkg/updatedd-mod-tzo.control
new file mode 100644
index 000000000..089dfde07
--- /dev/null
+++ b/openwrt/package/updatedd/ipkg/updatedd-mod-tzo.control
@@ -0,0 +1,4 @@
+Package: updatedd-mod-tzo
+Priority: optional
+Section: net
+Description: Plugin for updatedd, support for tzo.com dynamic DNS service.
diff --git a/openwrt/package/usbutils/Config.in b/openwrt/package/usbutils/Config.in
index a1a712df0..b3e88d59e 100644
--- a/openwrt/package/usbutils/Config.in
+++ b/openwrt/package/usbutils/Config.in
@@ -1,14 +1,15 @@
+config BR2_COMPILE_USBUTILS
+	bool
+	depends BR2_PACKAGE_LSUSB
+
 config BR2_PACKAGE_LSUSB
-	tristate "lsusb - USB devices listing program"
+	prompt "lsusb............................. USB devices listing program"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_COMPILE_USBUTILS
 	select BR2_PACKAGE_LIBUSB
 	help
 	  A program to list Linux USB devices
 	  
 	  http://linux-usb.sourceforge.net/
-	  
-
-config BR2_PACKAGE_USBUTILS
-	tristate
-	default BR2_PACKAGE_LSUSB
 
diff --git a/openwrt/package/util-linux/Config.in b/openwrt/package/util-linux/Config.in
index ed62b7c01..87d41ea49 100644
--- a/openwrt/package/util-linux/Config.in
+++ b/openwrt/package/util-linux/Config.in
@@ -1,29 +1,31 @@
+menu "util-linux"
+
 config BR2_COMPILE_UTIL_LINUX
 	bool
 	default n
-	depends BR2_PACKAGE_FDISK
+	depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS
 
 config BR2_PACKAGE_FDISK
-	tristate "fdisk - A partition table manipulation utility"
+	prompt "fdisk............................. A partition table manipulation utility"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_UTIL_LINUX
 	help
 	  A partition table manipulation utility
 	  
 	  http://www.kernel.org/pub/linux/utils/util-linux/
-	  
 
 config BR2_PACKAGE_SWAP_UTILS
-	tristate "swap-utils - Swap space management utilities"
+	prompt "swap-utils........................ Swap space management utilities"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_COMPILE_UTIL_LINUX
 	help
 	  A collection of tools to manage swap space :
-	  
 	    * mkswap
 	    * swapon
 	    * swapoff
 	  
 	  http://www.kernel.org/pub/linux/utils/util-linux/
-	  
 
+endmenu
diff --git a/openwrt/package/vsftpd/Config.in b/openwrt/package/vsftpd/Config.in
index 3bd5f2597..2db928709 100644
--- a/openwrt/package/vsftpd/Config.in
+++ b/openwrt/package/vsftpd/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_VSFTPD
-	tristate "vsftpd - Fast and secure FTP server"
+	prompt "vsftpd............................ Fast and secure FTP server"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A fast and secure FTP server
 	  
 	  http://vsftpd.beasts.org/
-	  
+
diff --git a/openwrt/package/vtun/Config.in b/openwrt/package/vtun/Config.in
index 67ccbd4f1..c2fa9f50b 100644
--- a/openwrt/package/vtun/Config.in
+++ b/openwrt/package/vtun/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_VTUN
-	tristate "vtun - VPN tunneling daemon"
+	prompt "vtun.............................. VPN tunneling daemon"
+	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBLZO
+	select BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LZO
-	select BR2_PACKAGE_OPENSSL
 	help
 	  A VPN tunneling daemon
 	  
 	  http://vtun.sourceforge.net
+
diff --git a/openwrt/package/wificonf/Config.in b/openwrt/package/wificonf/Config.in
index c346f5fd3..e4cfaa5fa 100644
--- a/openwrt/package/wificonf/Config.in
+++ b/openwrt/package/wificonf/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_WIFICONF
-	tristate "wificonf - replacement utility for wlconf"
+	prompt "wificonf.......................... replacement utility for wlconf"
+	tristate
 	default y
 	help
 	  Replacement utility for wlconf
+
diff --git a/openwrt/package/wifidog/Config.in b/openwrt/package/wifidog/Config.in
index 75c579180..3aa7a6036 100644
--- a/openwrt/package/wifidog/Config.in
+++ b/openwrt/package/wifidog/Config.in
@@ -1,12 +1,16 @@
 config BR2_PACKAGE_WIFIDOG
-	tristate "wifidog - wireless captive portal solution"
+	prompt "wifidog........................... A wireless captive portal solution"
+	tristate
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_IPTABLES_EXTRA
-    	select BR2_PACKAGE_KMOD_IPTABLES_V4
-    	select BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_KMOD_IPTABLES_V4
+	select BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
 	help
-      The Wifidog project is a complete and embeddable captive
-      portal solution for wireless community groups or individuals
-      who wish to open a free Hotspot while still preventing abuse
-      of their Internet connection.
+	  The Wifidog project is a complete and embeddable captive
+	  portal solution for wireless community groups or individuals
+	  who wish to open a free Hotspot while still preventing abuse
+	  of their Internet connection.
+	  
+	  http://www.wifidog.org/
+
diff --git a/openwrt/package/wireless-tools/Config.in b/openwrt/package/wireless-tools/Config.in
index 1c155bb77..deed30fda 100644
--- a/openwrt/package/wireless-tools/Config.in
+++ b/openwrt/package/wireless-tools/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_WIRELESS_TOOLS
-	tristate "wireless-tools - Tools for manipulating Linux Wireless Extensions"
+	prompt "wireless-tools.................... Tools for manipulating Linux Wireless Extensions"
+	tristate
 	default y
 	help
 	  Tools for configuring Wireless Adapters implementing the "Wireless Extension"
+
diff --git a/openwrt/package/wiviz/Config.in b/openwrt/package/wiviz/Config.in
index 301bb627f..5778e0e71 100644
--- a/openwrt/package/wiviz/Config.in
+++ b/openwrt/package/wiviz/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_WIVIZ
-	tristate "wiviz - Wireless Network Visualization"
+	prompt "wiviz............................. Wireless Network Visualization"
+	tristate
 	default m if CONFIG_DEVEL
 	help
-	 Wireless Network Visualization
+	  Wireless Network Visualization
+	  
+	  http://students.washington.edu/natetrue/wiviz/
 
-	 http://students.washington.edu/natetrue/wiviz/
diff --git a/openwrt/package/wol/Config.in b/openwrt/package/wol/Config.in
index 81053d455..1413d6b98 100644
--- a/openwrt/package/wol/Config.in
+++ b/openwrt/package/wol/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_WOL
-	tristate "wol - Wake On LAN client"
+	prompt "wol............................... Wake On LAN client"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  wol implements Wake On LAN functionality in a small program. 
 	  It wakes up hardware that is Magic Packet compliant.
 	  
 	  http://ahh.sourceforge.net/wol/
-	  
+
diff --git a/openwrt/package/wondershaper/Config.in b/openwrt/package/wondershaper/Config.in
index 020b92b91..7fa3c2623 100644
--- a/openwrt/package/wondershaper/Config.in
+++ b/openwrt/package/wondershaper/Config.in
@@ -1,8 +1,10 @@
 config BR2_PACKAGE_WONDERSHAPER
-	tristate "WonderShaper - The Wonder Shaper"
+	prompt "wondershaper...................... The Wonder Shaper"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_IPROUTE2_TC
 	help
-	   WonderShaper is a tc based traffic shaping tool.
-	   
-	   Depends: tc
+	  WonderShaper is a tc based traffic shaping tool.
+	  
+	  Depends: tc
+
diff --git a/openwrt/package/wpa_supplicant/Config.in b/openwrt/package/wpa_supplicant/Config.in
index efff5832d..00a756b4c 100644
--- a/openwrt/package/wpa_supplicant/Config.in
+++ b/openwrt/package/wpa_supplicant/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_WPA_SUPPLICANT
-	tristate "wpa_supplicant - WPA Supplicant with support for WPA and WPA2"
+	prompt "wpa_supplicant.................... WPA Supplicant with support for WPA and WPA2"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
 	help
-	  
 	  WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN).
 	  Supplicant is the IEEE 802.1X/WPA component that is used in the client 
 	  stations. It implements key negotiation with a WPA Authenticator and it 
@@ -12,4 +12,4 @@ config BR2_PACKAGE_WPA_SUPPLICANT
 	  http://hostap.epitest.fi/wpa_supplicant/
 	  
 	  Depends: openssl
-	  
+
diff --git a/openwrt/package/wput/Config.in b/openwrt/package/wput/Config.in
index 8aa5ba334..e1e7b7ab7 100644
--- a/openwrt/package/wput/Config.in
+++ b/openwrt/package/wput/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_WPUT
-	tristate "wput - A wget-like command-line FTP client"
+	prompt "wput.............................. A wget-like command-line FTP client"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A wget-like command-line FTP client.
 	  
 	  http://itooktheredpill.dyndns.org/wput/
-	  
 
diff --git a/openwrt/package/wrt-radauth/Config.in b/openwrt/package/wrt-radauth/Config.in
index b21c5fc8b..fc34213f0 100644
--- a/openwrt/package/wrt-radauth/Config.in
+++ b/openwrt/package/wrt-radauth/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WRT_RADAUTH
-        tristate "wrt-radauth - a RADIUS MAC authenticator for Broadcom based access points"
+	prompt "wrt-radauth....................... A Radius MAC authenticator for Broadcom based access points"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  This software watches the stations associating to a broadcom based
@@ -7,4 +8,4 @@ config BR2_PACKAGE_WRT_RADAUTH
 	  to the radius-server specified in nvram.
 	  
 	  http://www.zerfleddert.de/wrt54g/
-	  
+
diff --git a/openwrt/package/xinetd/Config.in b/openwrt/package/xinetd/Config.in
index adff6ed1b..f833c5d70 100644
--- a/openwrt/package/xinetd/Config.in
+++ b/openwrt/package/xinetd/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_XINETD
-	tristate "xinetd - Powerful and secure superserver"
+	prompt "xinetd............................ Powerful and secure superserver"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A powerful and secure superserver
 	  
 	  http://www.xinetd.org/
-	  
+
diff --git a/openwrt/package/xsupplicant/Config.in b/openwrt/package/xsupplicant/Config.in
index b84840621..f9746d0b4 100644
--- a/openwrt/package/xsupplicant/Config.in
+++ b/openwrt/package/xsupplicant/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XSUPPLICANT
-	tristate "xsupplicant - a fully compliant 802.1x authenticator"
+	prompt "xsupplicant....................... A fully compliant 802.1x authenticator"
+	tristate
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_WIRELESS_TOOLS
@@ -8,4 +9,4 @@ config BR2_PACKAGE_XSUPPLICANT
 	  a RADIUS server using 802.1x and various EAP protocols.
 	  
 	  http://open1x.sourceforge.net/
-	  
+
diff --git a/openwrt/package/zlib/Config.in b/openwrt/package/zlib/Config.in
index a90fae8c4..4b96d9415 100644
--- a/openwrt/package/zlib/Config.in
+++ b/openwrt/package/zlib/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_ZLIB
-	tristate "zlib - Library implementing the deflate compression method"
+	prompt "zlib.............................. Library implementing the deflate compression method"
+	tristate
 	default m if CONFIG_DEVEL
 	help
 	  A library implementing the 'deflate' compression method
 	  
 	  http://www.zlib.net/
+