diff --git a/Config.in b/Config.in
index 799709324..60aefc92c 100644
--- a/Config.in
+++ b/Config.in
@@ -243,14 +243,14 @@ choice
 
 config BR2_STRIP_strip
 	bool "strip"
-	depends !BR2_ENABLE_DEBUG
+	depends on !BR2_ENABLE_DEBUG
 	help
 	  strip   is the normal strip command
 
 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
-	depends !BR2_ENABLE_DEBUG
+	depends on !BR2_ENABLE_DEBUG
 	help
 	  sstrip  is a strip that discards more than the normal strip
 
diff --git a/package/argus/Config.in b/package/argus/Config.in
index 97f8ec1e8..b159a4186 100644
--- a/package/argus/Config.in
+++ b/package/argus/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_ARGUS
 	bool "argus"
 	default n
-	depends BR2_PACKAGE_LIBPCAP
+	depends on BR2_PACKAGE_LIBPCAP
 	help
 	  A Real Time Flow Monitor-based audit engine.
 
diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
index 36238debb..1a35546e7 100644
--- a/package/asterisk/Config.in
+++ b/package/asterisk/Config.in
@@ -3,11 +3,11 @@ config BR2_PACKAGE_ASTERISK
 	default n
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ZLIB
-	depends BR2_PACKAGE_OPENSSL
-	depends BR2_PACKAGE_MPG123
+	depends on BR2_PACKAGE_OPENSSL
+	depends on BR2_PACKAGE_MPG123
 	help
 		Asterisk - the Open Source PBX
 
 comment "asterisk	- disabled (required openssl and mpg123)"
-	depends !BR2_PACKAGE_OPENSSL || ! BR2_PACKAGE_MPG123
+	depends on !BR2_PACKAGE_OPENSSL || ! BR2_PACKAGE_MPG123
 
diff --git a/package/atk/Config.in b/package/atk/Config.in
index 6fcaf1c43..baa153b76 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -2,9 +2,9 @@ config BR2_PACKAGE_ATK
 	bool "atk"
 	select BR2_PACKAGE_PKGCONFIG
 	default n
-	depends BR2_PACKAGE_LIBGLIB2
+	depends on BR2_PACKAGE_LIBGLIB2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
 
 comment "atk		- disabled (requires libglib2)"
-	depends !BR2_PACKAGE_LIBGLIB2
+	depends on !BR2_PACKAGE_LIBGLIB2
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 2114dce94..6a45d4e70 100644
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -24,7 +24,7 @@ config BR2_PACKAGE_AVAHI_DAEMON
 	bool "mDNS/DNS-SD daemon"
 	default n
 	depends on BR2_PACKAGE_AVAHI
-	depends BR2_PACKAGE_EXPAT
+	depends on BR2_PACKAGE_EXPAT
 	help
 	  The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf
 	  architecture (also known as "Rendezvous" or "Bonjour").
@@ -33,4 +33,4 @@ config BR2_PACKAGE_AVAHI_DAEMON
 
 comment "mDNS/DNS-SD daemon	- disabled (requires expat)"
 	depends on BR2_PACKAGE_AVAHI
-	depends !BR2_PACKAGE_EXPAT
+	depends on !BR2_PACKAGE_EXPAT
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index 40de632bb..7e8d7df0e 100644
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_BLACKBOX
 	  http://blackboxwm.sourceforge.net/
 
 comment "blackbox		- disabled (requires Xorg(7))"
-	depends !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
+	depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 551ef635e..1c54e845f 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -11,7 +11,7 @@ config BR2_PACKAGE_BUSYBOX
 
 choice
 	prompt "BusyBox Version"
-	depends BR2_PACKAGE_BUSYBOX
+	depends on BR2_PACKAGE_BUSYBOX
 	default BR2_BUSYBOX_VERSION_1_10_X
 	help
 	  Select the version of BusyBox you wish to use.
@@ -55,7 +55,7 @@ config BR2_BUSYBOX_VERSION
 
 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"
-	depends BR2_PACKAGE_BUSYBOX
+	depends on BR2_PACKAGE_BUSYBOX
 	default y
 	help
 	  If you want to run BusyBox's own full install for the
@@ -68,7 +68,7 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
-	depends BR2_PACKAGE_BUSYBOX
+	depends on BR2_PACKAGE_BUSYBOX
 	default "target/device/x86/i386/busybox.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
 	default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_6_1
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 343656c35..e54d86c8e 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -13,7 +13,7 @@ comment "dbus not available (need expat or libxml2)"
 
 choice
 	prompt "XML library to use"
-	depends BR2_PACKAGE_DBUS
+	depends on BR2_PACKAGE_DBUS
 	default BR2_DBUS_LIBXML2 if BR2_PACKAGE_LIBXML2
 	default BR2_DBUS_EXPAT
 	help
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 4d19710a8..26bc455ca 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_ISC_DHCP
 
 config BR2_PACKAGE_DHCP_SERVER
 	bool "dhcp server"
-	depends BR2_PACKAGE_ISC_DHCP
+	depends on BR2_PACKAGE_ISC_DHCP
 	default n
 	help
 	  DHCP server from the ISC DHCP distribution.
@@ -16,7 +16,7 @@ config BR2_PACKAGE_DHCP_SERVER
 
 config BR2_PACKAGE_DHCP_RELAY
 	bool "dhcp relay"
-	depends BR2_PACKAGE_ISC_DHCP
+	depends on BR2_PACKAGE_ISC_DHCP
 	default n
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
@@ -24,7 +24,7 @@ config BR2_PACKAGE_DHCP_RELAY
 
 config BR2_PACKAGE_DHCP_CLIENT
 	bool "dhcp client"
-	depends BR2_PACKAGE_ISC_DHCP
+	depends on BR2_PACKAGE_ISC_DHCP
 	default n
 	help
 	  DHCP client from the ISC DHCP distribution.
diff --git a/package/dillo/Config.in b/package/dillo/Config.in
index 727d305be..1635af14b 100644
--- a/package/dillo/Config.in
+++ b/package/dillo/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_DILLO
 	bool "dillo"
 	default n
-	depends BR2_PACKAGE_JPEG
-	depends BR2_PACKAGE_LIBGLIB12
-	depends BR2_PACKAGE_LIBGTK12
-	depends BR2_PACKAGE_ZLIB
-	depends BR2_PACKAGE_LIBPNG
+	depends on BR2_PACKAGE_JPEG
+	depends on BR2_PACKAGE_LIBGLIB12
+	depends on BR2_PACKAGE_LIBGTK12
+	depends on BR2_PACKAGE_ZLIB
+	depends on BR2_PACKAGE_LIBPNG
 	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	help
 	  Dillo is a small GTK+ based web browser written in C.
@@ -13,4 +13,4 @@ config BR2_PACKAGE_DILLO
 	  http://www.dillo.org/
 
 comment "dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))"
-	depends !BR2_PACKAGE_JPEG || !BR2_PACKAGE_LIBGLIB12 || !BR2_PACKAGE_LIBGTK12 || !BR2_PACKAGE_ZLIB || !BR2_PACKAGE_LIBPNG || !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
+	depends on !BR2_PACKAGE_JPEG || !BR2_PACKAGE_LIBGLIB12 || !BR2_PACKAGE_LIBGTK12 || !BR2_PACKAGE_ZLIB || !BR2_PACKAGE_LIBPNG || !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
diff --git a/package/editors/vim/Config.in b/package/editors/vim/Config.in
index ddf0a604f..9dd90b90c 100644
--- a/package/editors/vim/Config.in
+++ b/package/editors/vim/Config.in
@@ -11,7 +11,7 @@ config BR2_PACKAGE_VIM
 config BR2_PACKAGE_VIM_RUNTIME
 	bool "install runtime"
 	default y
-	depends BR2_PACKAGE_VIM
+	depends on BR2_PACKAGE_VIM
 	help
 	  Install VIM runtime (syntax highlighing + macros).
 	  This option adds about 13MB of data to /usr/share/
diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index 08184bf2e..e91dc79df 100644
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_FLTK
 	  http://www.fltk.org/
 
 comment "fltk		- disabled (requires Xorg(7))"
-	depends !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
+	depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
diff --git a/package/freetype/Config.in b/package/freetype/Config.in
index 7159a0727..fd3dabbe3 100644
--- a/package/freetype/Config.in
+++ b/package/freetype/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_FREETYPE
 
 choice
 	prompt "Freetype Version"
-	depends BR2_PACKAGE_FREETYPE
+	depends on BR2_PACKAGE_FREETYPE
 	default BR2_FREETYPE_VERSION_2_2_1
 	help
 	  Select the version of Freetype you wish to use.
diff --git a/package/gtk2-engines/Config.in b/package/gtk2-engines/Config.in
index ae4c159c5..ef1f15081 100644
--- a/package/gtk2-engines/Config.in
+++ b/package/gtk2-engines/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBGTK2_ENGINES
 	bool "gtk engines"
 	default n
-	depends BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_LIBGTK2
 	help
 	  A collection of basic theme engines for GTK+.
diff --git a/package/gtk2-themes/Config.in b/package/gtk2-themes/Config.in
index 0e0a96555..9b295afad 100644
--- a/package/gtk2-themes/Config.in
+++ b/package/gtk2-themes/Config.in
@@ -1,9 +1,9 @@
 menu "GTK Themes"
-depends BR2_PACKAGE_LIBGTK2
+depends on BR2_PACKAGE_LIBGTK2
 
 config BR2_PACKAGE_GTK2_THEME_HICOLOR
 	bool "hicolor (defaut theme)"
 	default n
-	depends BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_LIBGTK2
 
 endmenu
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 982824329..7ea9705e4 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_IPSEC_TOOLS
 	bool "ipsec-tools"
 	default n
-	depends BR2_PACKAGE_OPENSSL && BR2_PACKAGE_FLEX && BR2_PACKAGE_FLEX_LIBFL
+	depends on BR2_PACKAGE_OPENSSL && BR2_PACKAGE_FLEX && BR2_PACKAGE_FLEX_LIBFL
 	help
 	  This package is required to support IPSec for Linux 2.6+
 
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 2e79ea74e..6388d08b7 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_MATCHBOX
 
 config BR2_PACKAGE_MATCHBOX_SNOTIFY
 	bool "Enable Matchbox Startup Notification"
-	depends BR2_PACKAGE_MATCHBOX
+	depends on BR2_PACKAGE_MATCHBOX
 	select BR2_PACKAGE_XAPP_XSM
 	default n
 	help
@@ -21,7 +21,7 @@ config BR2_PACKAGE_MATCHBOX_SNOTIFY
 
 config BR2_PACKAGE_MATCHBOX_PANEL
 	bool "Matchbox Panel"
-	depends BR2_PACKAGE_MATCHBOX
+	depends on BR2_PACKAGE_MATCHBOX
 	default n
 	help
 
@@ -29,7 +29,7 @@ config BR2_PACKAGE_MATCHBOX_PANEL
 
 config BR2_PACKAGE_MATCHBOX_DESKTOP
 	bool "Matchbox Desktop"
-	depends BR2_PACKAGE_MATCHBOX
+	depends on BR2_PACKAGE_MATCHBOX
 	default n
 	help
 
@@ -37,7 +37,7 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP
 
 config BR2_PACKAGE_MATCHBOX_KEYBOARD
 	bool "Metchbox Virtual Keyboard"
-	depends BR2_PACKAGE_MATCHBOX
+	depends on BR2_PACKAGE_MATCHBOX
 	select BR2_PACKAGE_XLIB_LIBXTST
 	default n
 	help
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 9142d103f..7490e52f4 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -11,4 +11,4 @@ config BR2_PACKAGE_MIDORI
 	  http://software.twotoasts.de/?page=midori
 
 comment "midori		- disabled (requires Xorg(7))"
-	depends !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
+	depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
diff --git a/package/modutils/Config.in b/package/modutils/Config.in
index da445d4b9..7e9bdf814 100644
--- a/package/modutils/Config.in
+++ b/package/modutils/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MODUTILS
 	bool "modutils"
 	default n
-	depends !BR2_PACKAGE_MODULE_INIT_TOOLS
+	depends on !BR2_PACKAGE_MODULE_INIT_TOOLS
 	help
 	  The modutils packages includes the kerneld program for automatic 
 	  loading and unloading of modules, as well as other module 
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 7e43ac3c5..c5e2cab8f 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -38,7 +38,7 @@ config BR2_PACKAGE_MTD_UTILS_GIT
 endchoice
 
 comment "MTD tools selection"
-	depends BR2_PACKAGE_MTD
+	depends on BR2_PACKAGE_MTD
 
 config BR2_PACKAGE_MTD_DOCFDISK
 	bool "docfdisk"
diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index c1028f227..e4a240553 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -8,36 +8,36 @@ config BR2_PACKAGE_NCFTP
 	  http://www.ncftp.com/ncftp/
 
 menu "ncFTP tools selection"
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_GET
 	bool "NcFTPGet - command-line utility program"
 	default y
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_PUT
 	bool "NcFTPPut - command-line utility program"
 	default y
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_LS
 	bool "NcFTPLs - command-line utility program"
 	default y
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_BATCH
 	bool "NcFTPBatch - background FTP program for individual users"
 	default y
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_SPOOLER
 	bool "NcFTPSpooler - spooler - not working properly"
 	default n
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 config BR2_PACKAGE_NCFTP_BOOKMARKS
 	bool "NcFTPBookmarks - not working properly"
 	default n
-	depends BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCFTP
 
 endmenu
diff --git a/package/neon/Config.in b/package/neon/Config.in
index 8ac9d0811..69fcff95e 100644
--- a/package/neon/Config.in
+++ b/package/neon/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_NEON
 choice
 	prompt "XML Support"
 	default BR2_PACKAGE_NEON_NOXML
-	depends BR2_PACKAGE_NEON
+	depends on BR2_PACKAGE_NEON
 	help
 	  Select which XML library to use...
 	  expat      use exapt
@@ -18,13 +18,13 @@ choice
 
 config BR2_PACKAGE_NEON_EXPAT
 	bool "expat"
-	depends BR2_PACKAGE_EXPAT
+	depends on BR2_PACKAGE_EXPAT
 	help
 	  expat      use exapt, a library for parsing XML.
 
 config BR2_PACKAGE_NEON_LIBXML2
 	bool "libxml2"
-	depends BR2_PACKAGE_LIBXML2
+	depends on BR2_PACKAGE_LIBXML2
 	help
 	  libxml2    use libxml2, a library to read, modify and 
 	             write XML and HTML files.
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 04be8c336..06062de30 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -13,7 +13,7 @@ comment "nfs-utils requires a toolchain with 'Enable RPC' selected"
 	depends on !BR2_INET_RPC
 
 menu "NFS utilities selection"
-	depends BR2_PACKAGE_NFS_UTILS
+	depends on BR2_PACKAGE_NFS_UTILS
 
 config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
 	bool "rpcdebug"
diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index cd9c7bba1..147c30e6d 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -10,6 +10,6 @@ config BR2_PACKAGE_NTP
 config BR2_PACKAGE_NTP_SNTP
 	bool "sntp"
 	default n
-	depends BR2_PACKAGE_NTP
+	depends on BR2_PACKAGE_NTP
 	help
 	  Simple network time protocol program
diff --git a/package/pcmcia/Config.in b/package/pcmcia/Config.in
index 6ad1eed4e..d5503f1ad 100644
--- a/package/pcmcia/Config.in
+++ b/package/pcmcia/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PCMCIA
 	bool "pcmcia"
 	default n
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  PCMCIA tools for Linux.
 
diff --git a/package/qte/Config.in b/package/qte/Config.in
index 78a564daf..aae36b9a0 100644
--- a/package/qte/Config.in
+++ b/package/qte/Config.in
@@ -16,7 +16,7 @@ config BR2_PACKAGE_QTE
 config BR2_PACKAGE_QTE_COMMERCIAL_USERNAME
 	string "Qt/E Commercial License Username"
 	default ""
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 	help
 	    Commercial users can download their source directly by providing a username.  I do not mean this to be a political or economic statement, just a convenience function
 
@@ -24,7 +24,7 @@ config BR2_PACKAGE_QTE_COMMERCIAL_USERNAME
 config BR2_PACKAGE_QTE_COMMERCIAL_PASSWORD
 	string "Qt/E Commercial License Password"
 	default ""
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 	help
 	    Commercial users can download their source directly by providing a password.  I do not mean this to be a political or economic statement, just a convenience function
 
@@ -32,7 +32,7 @@ config BR2_PACKAGE_QTE_COMMERCIAL_PASSWORD
 choice
 	prompt "Qt/E Version"
 	default BR2_QTE_VERSION_2_3_11
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 	help
 	  Select the version of Qt/E you wish to use.
 
@@ -61,7 +61,7 @@ config BR2_QTE_VERSION
 config BR2_PACKAGE_QTE_QVFB
 	bool "QVfb"
 	default n
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 	help
 	  Trolltech provides a Virtual Framebuffer used to simulate the embedded device during development
 
@@ -70,7 +70,7 @@ config BR2_PACKAGE_QTE_QVFB
 choice
 	prompt "QVfb Version"
 	default BR2_QTE_QVFB_VERSION_2_3_2
-	depends BR2_PACKAGE_QTE_QVFB
+	depends on BR2_PACKAGE_QTE_QVFB
 	help
 	  Select the version of QVfb you wish to use.
 
@@ -92,7 +92,7 @@ config BR2_QTE_QVFB_VERSION
 config BR2_PACKAGE_QTE_QT3
 	bool "Qt/E-3.3.x for Qtopia build"
 	default n
-	depends BR2_PACKAGE_QTE_QTOPIA
+	depends on BR2_PACKAGE_QTE_QTOPIA
 	help
 	  Qtopia requires a Qt/E version >= 3.3.0; when using a Qt/E-2.3.x on the runtime, Qtopia still needs a Qt/E-3.3.x codebase to build
 
@@ -101,7 +101,7 @@ config BR2_PACKAGE_QTE_QT3
 choice
 	prompt "QT/E v3 Version"
 	default BR2_QTE_QT3_VERSION_3_3_4
-	depends BR2_PACKAGE_QTE_QT3
+	depends on BR2_PACKAGE_QTE_QT3
 	help
 	  Select the version of QVfb you wish to use.
 
@@ -122,7 +122,7 @@ config BR2_QTE_QT3_VERSION
 config BR2_PACKAGE_QTE_QTOPIA
 	bool "Qtopia"
 	default n
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 	help
 	  Qtopia defines some more advanced components used for mobile devices
 
@@ -131,7 +131,7 @@ config BR2_PACKAGE_QTE_QTOPIA
 choice
 	prompt "Qtopia Version"
 	default BR2_QTE_QTOPIA_VERSION_2_1_2
-	depends BR2_PACKAGE_QTE_QTOPIA
+	depends on BR2_PACKAGE_QTE_QTOPIA
 	help
 	  Select the version of Qtopia you wish to use.
 
@@ -151,7 +151,7 @@ config BR2_QTE_QTOPIA_VERSION
 config BR2_QTE_TMAKE_VERSION
 	string
 	default "1.13"
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 
 # generated from:
 # ls ~/src/buildroot/build_arm/qt-2.3.10/configs/*-static|cut -c56-|sed -e 's/-static//g'|\
@@ -160,33 +160,33 @@ config BR2_QTE_TMAKE_VERSION
 choice
 	prompt "Qt/E Cross-Compiler Target Platform"
 	default BR2_QTE_CROSS_LINUX_ARM_GPP
-	depends BR2_PACKAGE_QTE
+	depends on BR2_PACKAGE_QTE
 	help
 	  Select the Qt cross-platform string for your build
 
 	config BR2_QTE_CROSS_CYGWIN_ARM_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-cygwin-arm-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "cygwin-arm-g++"
 
 	config BR2_QTE_CROSS_CYGWIN_IPAQ_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-cygwin-ipaq-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "cygwin-ipaq-g++"
 
 	config BR2_QTE_CROSS_CYGWIN_SHARP_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-cygwin-sharp-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "cygwin-sharp-g++"
 
 	config BR2_QTE_CROSS_FREEBSD_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-freebsd-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "freebsd-g++"
 
 	config BR2_QTE_CROSS_LINUX_ARM_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-linux-arm-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "linux-arm-g++"
 
 	config BR2_QTE_CROSS_LINUX_CASSIOPEIA_GPP
@@ -203,17 +203,17 @@ choice
 
 	config BR2_QTE_CROSS_LINUX_KOALA_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-linux-koala-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "linux-koala-g++"
 
 	config BR2_QTE_CROSS_LINUX_MIPS_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-linux-mips-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "linux-mips-g++"
 
 	config BR2_QTE_CROSS_LINUX_SH3_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-linux-sh3-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "linux-sh3-g++"
 
 	config BR2_QTE_CROSS_LINUX_SHARP_GPP
@@ -224,17 +224,17 @@ choice
 
 	config BR2_QTE_CROSS_QNX_RTP_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-qnx-rtp-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "qnx-rtp-g++"
 
 	config BR2_QTE_CROSS_SOLARIS_GPP
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-solaris-g++.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "solaris-g++"
 
 	config BR2_QTE_CROSS_WIN32_MSVC
 		# qtopia-phone does not have this platform in qtopia-phone-2.1.1/src/libraries/qtopia/custom-win32-msvc.{cpp,h}
-		depends !BR2_PACKAGE_QTE_QTOPIA
+		depends on !BR2_PACKAGE_QTE_QTOPIA
 		bool "win32-msvc"
 
 endchoice
diff --git a/package/qtopia4/Config.in b/package/qtopia4/Config.in
index 1f7153e3a..395e7ff9e 100644
--- a/package/qtopia4/Config.in
+++ b/package/qtopia4/Config.in
@@ -11,12 +11,12 @@ config BR2_PACKAGE_QTOPIA4
 config BR2_PACKAGE_QTOPIA4_DEBUG
 	bool "Compile with debug support"
 	default n
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 
 choice
 	prompt "Library type"
 	default BR2_PACKAGE_QTOPIA4_SHARED
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Selects the library type: Shared or Static
 
@@ -29,7 +29,7 @@ endchoice
 choice
 	prompt "Qtopia 4 Core license type"
 	default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Selects the type of license you which to use for Qtopia 4 Core.
 
@@ -44,7 +44,7 @@ endchoice
 config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED
 	bool "Approve Qtopia Core 4 GPL licence"
 	default n
-	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
+	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
 	help
 	  Select this if you approve the GNU GENERAL PUBLIC LICENSE Version 2
 	  on the Qtopia Core 4 library. By doing this you will not be asked
@@ -57,7 +57,7 @@ config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
 	string "Qtopia Core 4 Commercial License Username"
 	default ""
-	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
+	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
 	  Commercial users can download their source directly by providing a username.
 
@@ -65,34 +65,34 @@ config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
 	string "Qtopia Core 4 Commercial License Password"
 	default ""
-	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
+	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
 	  Commercial users can download their source directly by providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	default y
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Turns on support for older Qt3.
 
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"
 	default n
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for GIF reading support.
 
 config BR2_PACKAGE_QTOPIA4_LIBMNG
 	bool "Enable libmng support"
 	default n
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for MNG support.
 
 choice
 	prompt "JPEG support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOJPEG
 	help
 	  Select libjpeg support.
@@ -111,7 +111,7 @@ endchoice
 
 choice
 	prompt "PNG support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOPNG
 	help
 	  Select which library to use if PNG support should be enabled.
@@ -130,7 +130,7 @@ endchoice
 
 choice
 	prompt "TIFF support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOTIFF
 	help
 	  Select which library to use if TIFF support should be enabled.
@@ -149,25 +149,25 @@ endchoice
 
 config BR2_PACKAGE_QTOPIA4_SVG
 	bool "Enable SVG support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Enable the QtSvg library.
 
 config BR2_PACKAGE_QTOPIA4_SQL
 	bool "Enable SQL support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Enable all the SQL drivers it QtSql library.
 
 config BR2_PACKAGE_QTOPIA4_OPENSSL
 	bool "Enable OpenSSL support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Enable support for the OpenSSL encryption library.
 
 choice
 	prompt "zlib support"
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_QTZLIB
 	help
 	  Select zlib support.
@@ -211,6 +211,6 @@ config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	default "generic"	if BR2_sh
 	default "generic"	if BR2_sh64
 	default "generic"	if BR2_sparc
-	depends BR2_PACKAGE_QTOPIA4
+	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  The platform.
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 880147aa4..6158cde7c 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -58,7 +58,7 @@ config BR2_PACKAGE_QUAGGA_OSPF6D
 	bool "quagga ospf6d"
 	default n
 	select BR2_PACKAGE_QUAGGA
-	depends BR2_INET_IPV6
+	depends on BR2_INET_IPV6
 	help
 	  routing software suite, providing implementations of
 	  OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4.
diff --git a/package/rxvt/Config.in b/package/rxvt/Config.in
index 4e646b111..a5b5da07f 100644
--- a/package/rxvt/Config.in
+++ b/package/rxvt/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_RXVT
 	bool "rxvt"
 	default n
-	depends BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx || BR2_PACKAGE_XSERVER_x11r7
+	depends on BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx || BR2_PACKAGE_XSERVER_x11r7
 	help
 	  A nice small colour vt102 X terminal emulator.
 
diff --git a/package/samba/Config.in b/package/samba/Config.in
index 134ee790b..08c605f66 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_SAMBA
 		so choose only the components you need.
 
 menu "Samba tools selection"
-	depends BR2_PACKAGE_SAMBA
+	depends on BR2_PACKAGE_SAMBA
 
 config BR2_PACKAGE_SAMBA_CIFS
 	bool "cifs"
diff --git a/package/sdl/Config.in b/package/sdl/Config.in
index 277d3c1e0..626040eb2 100644
--- a/package/sdl/Config.in
+++ b/package/sdl/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_SDL
 	  http://www.libsdl.org/
 
 menu "SDL options selection"
-	depends BR2_PACKAGE_SDL
+	depends on BR2_PACKAGE_SDL
 
 config BR2_PACKAGE_SDL_FBCON
 	bool "SDL framebuffer console video driver"
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 9a137ae37..ad615c200 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_SYNERGY
 	bool "synergy"
 	default n
-	depends BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XORG7
 	help
 	  Synergy lets you easily share a single mouse and 
 	  keyboard between multiple computers with different 
diff --git a/package/tcl/Config.in b/package/tcl/Config.in
index 1f75266f0..3b6ba937a 100644
--- a/package/tcl/Config.in
+++ b/package/tcl/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_TCL
 config BR2_PACKAGE_TCL_DEL_ENCODINGS
 	bool "delete encodings (saves 1.4Mb)"
 	default y
-	depends BR2_PACKAGE_TCL
+	depends on BR2_PACKAGE_TCL
 	help
 	  Delete encoding files for TCL. If your programs do not use various tcl
 	  character recoding functions, you may safely choose Y here.
@@ -18,7 +18,7 @@ config BR2_PACKAGE_TCL_DEL_ENCODINGS
 config BR2_PACKAGE_TCL_SHLIB_ONLY
 	bool "install only shared library"
 	default y
-	depends BR2_PACKAGE_TCL
+	depends on BR2_PACKAGE_TCL
 	help
 	  Install only TCL shared library and not binary tcl interpreter(tclsh8.4).
 	  Saves ~14kb.
diff --git a/package/udev/Config.in b/package/udev/Config.in
index 8917d1692..45f895827 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_UDEV_UTILS
 	  to your filesystem.
 
 menu "Extra udev tools"
-	depends BR2_PACKAGE_UDEV
+	depends on BR2_PACKAGE_UDEV
 
 config BR2_PACKAGE_UDEV_VOLUME_ID
 	bool "udev-libvolume_id"
diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
index 4eb6a9b69..8cbc24170 100644
--- a/package/valgrind/Config.in
+++ b/package/valgrind/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_VALGRIND
 	bool "valgrind"
 	default n
-	depends BR2_i386 || BR2_powerpc || BR2_x86_64
+	depends on BR2_i386 || BR2_powerpc || BR2_x86_64
 	help
 	  Tool for debugging and profiling Linux programs.
 
diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in
index f3c41e09a..e6cd07e46 100644
--- a/package/vpnc/Config.in
+++ b/package/vpnc/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_VPNC
 	bool "vpnc"
-	depends BR2_PACKAGE_LIBGCRYPT
-	depends BR2_PACKAGE_LIBGPG_ERROR
+	depends on BR2_PACKAGE_LIBGCRYPT
+	depends on BR2_PACKAGE_LIBGPG_ERROR
 	default n
 	help
 	  Client for Cisco VPN concentrator
@@ -13,4 +13,4 @@ config BR2_PACKAGE_VPNC
 	  http://www.unix-ag.uni-kl.de/~massar/vpnc
 
 comment "vpnc		- disabled (requires libgcrypt and libgpg_error)"
-	depends !BR2_PACKAGE_LIBGCRYPT || !BR2_PACKAGE_LIBGPG_ERROR
+	depends on !BR2_PACKAGE_LIBGCRYPT || !BR2_PACKAGE_LIBGPG_ERROR
diff --git a/package/webif/Config.in b/package/webif/Config.in
index 2e0d43672..254340980 100644
--- a/package/webif/Config.in
+++ b/package/webif/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_WEBIF
 
 config BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML
 	bool "instal index.html in /www which redirects to webif"
-	depends BR2_PACKAGE_WEBIF
+	depends on BR2_PACKAGE_WEBIF
 	default n
 	help
 	  Installs a /www/index.html which redirects to the status console cgi
@@ -20,7 +20,7 @@ config BR2_PACKAGE_WEBIF_INSTALL_INDEX_HTML
 
 config BR2_PACKAGE_WEBIF_LANGUAGES
 	bool "install language support"
-	depends BR2_PACKAGE_WEBIF
+	depends on BR2_PACKAGE_WEBIF
 	default n
 	help
 	  This option installs support for other languages than english.
diff --git a/package/x11r7/xdata_xkbdata/Config.in b/package/x11r7/xdata_xkbdata/Config.in
index 025c06867..cd56f7473 100644
--- a/package/x11r7/xdata_xkbdata/Config.in
+++ b/package/x11r7/xdata_xkbdata/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDATA_XKBDATA
 	bool "xkbdata"
 	default n
-	depends !BR2_PACKAGE_XKEYBOARD_CONFIG
+	depends on !BR2_PACKAGE_XKEYBOARD_CONFIG
 	help
 	  xkbdata 1.0.1
 	  No description available
diff --git a/package/xorg/Config.in b/package/xorg/Config.in
index 2290e4992..c4fb419b3 100644
--- a/package/xorg/Config.in
+++ b/package/xorg/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_XORG
-	depends BR2_DEPRECATED
+	depends on BR2_DEPRECATED
 	bool "X.org X Window System"
 	default y if BR2_PACKAGE_XSERVER_xorg
 	select BR2_PACKAGE_ZLIB
diff --git a/target/Config.in.arch b/target/Config.in.arch
index 00624288d..c9b0e469b 100644
--- a/target/Config.in.arch
+++ b/target/Config.in.arch
@@ -52,7 +52,7 @@ endchoice
 #
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_arm || BR2_armeb
+	depends on BR2_arm || BR2_armeb
 	default BR2_generic_arm
 	help
 	  Specific CPU variant to use
@@ -112,7 +112,7 @@ config BR2_ARM_TYPE
 
 choice
 	prompt "Target ABI"
-	depends BR2_arm || BR2_armeb
+	depends on BR2_arm || BR2_armeb
 	default BR2_ARM_OABI
 	help
 	  Application Binary Interface to use
@@ -125,7 +125,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_mips || BR2_mipsel
+	depends on BR2_mips || BR2_mipsel
 	default BR2_mips_3 if BR2_mips
 	default BR2_mips_1 if BR2_mipsel
 	help
@@ -157,7 +157,7 @@ endchoice
 
 choice
 	prompt "Target ABI"
-	depends BR2_mips || BR2_mipsel
+	depends on BR2_mips || BR2_mipsel
 	default BR2_MIPS_OABI32 if BR_mips_32 || BR_mips_32r2
 	default BR2_MIPS_ABI32 if BR_mips_64 || BR_mips_64r2
 	help
@@ -167,26 +167,26 @@ config BR2_MIPS_OABI32
 	bool "o32"
 config BR2_MIPS_ABI32
 	bool "n32"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_EABI
 	bool "eabi"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_ABI64
 	bool "n64"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_OABI64
 	bool "o64"
-	depends BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
+	depends on BR2_mips_3 || BR2_mips_4 || BR2_mips_64 || BR2_mips_64r2 || BR2_mips_16
 config BR2_MIPS_ABI_none
 	bool "unspecified"
-	depends BR2_mips_16
+	depends on BR2_mips_16
 	help
 	  Unspecified ABI leaves ABI selection blank.
 endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_avr32
+	depends on BR2_avr32
 config BR2_at32ap7000
 	bool "AT32AP7000"
 config BR2_at32ap7001
@@ -198,7 +198,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_sh
+	depends on BR2_sh
 	default BR2_sh4
 	help
 	  Specific CPU variant to use
@@ -223,7 +223,7 @@ endchoice
 #
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_i386
+	depends on BR2_i386
 	default BR2_x86_i386
 	help
 	  Specific CPU variant to use
@@ -280,7 +280,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_x86_64
+	depends on BR2_x86_64
 	default BR2_x86_64_core2
 	help
 	  Specific CPU variant to use
@@ -299,7 +299,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_alpha
+	depends on BR2_alpha
 	default BR2_alpha_21064
 	help
 	  Specific CPU variant to use
@@ -320,7 +320,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_s390
+	depends on BR2_s390
 	default BR2_s390_g5
 	help
 	  Specific CPU variant to use
@@ -339,7 +339,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_sparc
+	depends on BR2_sparc
 	default BR2_sparc_v7
 	help
 	  Specific CPU variant to use
@@ -382,7 +382,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_sparc64
+	depends on BR2_sparc64
 	default BR2_sparc64_v9
 	help
 	  Specific CPU variant to use
@@ -411,7 +411,7 @@ config BR2_SPARC_TYPE
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_ia64
+	depends on BR2_ia64
 	default BR2_ia64_itanium2
 	help
 	  Specific CPU variant to use
@@ -424,7 +424,7 @@ endchoice
 
 choice
 	prompt "Target Architecture Variant"
-	depends BR2_powerpc
+	depends on BR2_powerpc
 	default BR2_generic_powerpc
 	help
 	  Specific CPU variant to use
diff --git a/target/device/AMD/Config.in b/target/device/AMD/Config.in
index d2eb8f673..a636fdae4 100644
--- a/target/device/AMD/Config.in
+++ b/target/device/AMD/Config.in
@@ -1,9 +1,9 @@
 comment "AMD Specific Device Support"
-	depends BR2_mipsel || BR2_mips
+	depends on BR2_mipsel || BR2_mips
 
 config BR2_TARGET_AMD_ALCHEMY
 	bool "Board support for the AMD development boards"
-	depends BR2_mipsel || BR2_mips
+	depends on BR2_mipsel || BR2_mips
 	default n
 	help
 	  AMD Alchemy mips based systems
@@ -11,11 +11,11 @@ config BR2_TARGET_AMD_ALCHEMY
 config BR2_TARGET_AMD_ALCHEMY_DBAU1500
 	bool "AMD Alchemy DBAu1500 Development Board Support"
 	default n
-	depends BR2_TARGET_AMD_ALCHEMY
+	depends on BR2_TARGET_AMD_ALCHEMY
 	select BR2_PACKAGE_LINUX
 	help
 	  The AMD Alchemy DBAu1500 Development Board
 
 comment "Package support"
-	depends BR2_TARGET_AMD_ALCHEMY
+	depends on BR2_TARGET_AMD_ALCHEMY
 
diff --git a/target/device/ARMLTD/Config.in b/target/device/ARMLTD/Config.in
index ffa6a2749..76c92860e 100644
--- a/target/device/ARMLTD/Config.in
+++ b/target/device/ARMLTD/Config.in
@@ -1,14 +1,14 @@
 menuconfig BR2_TARGET_ARMLTD
 	bool "ARM Ltd. Device Support"
-	depends BR2_arm
+	depends on BR2_arm
 	default n
 
 comment "Arm based Device Support"
-	depends BR2_arm && BR2_TARGET_ARMLTD
+	depends on BR2_arm && BR2_TARGET_ARMLTD
 
 config BR2_TARGET_ARM_INTEGRATOR_926
 	bool "Integrator arm926"
-	depends BR2_arm && BR2_TARGET_ARMLTD
+	depends on BR2_arm && BR2_TARGET_ARMLTD
 	default y
 	select BR2_PACKAGE_LINUX
 	select BR2_ARM_EABI
diff --git a/target/device/Atmel/AT91_Config.in b/target/device/Atmel/AT91_Config.in
index 254a2f2be..1a5bb0b5c 100644
--- a/target/device/Atmel/AT91_Config.in
+++ b/target/device/Atmel/AT91_Config.in
@@ -1,9 +1,9 @@
 comment "Atmel AT91 Specific Device Support"
-	depends BR2_arm
+	depends on BR2_arm
 
 config BR2_TARGET_AT91
 	bool "Board support for the Atmel AT91 range of microprocessors"
-	depends BR2_arm
+	depends on BR2_arm
 	default n
 	help
 	  Atmel AT91 ARM based systems
@@ -12,7 +12,7 @@ comment	"Selection criteria"
 
 config	BR2_TARGET_ATMEL_ALL
 	bool "Allow all ARM targets"
-	depends BR2_arm
+	depends on BR2_arm
 	default y
 
 config	BR2_TARGET_ATMEL_NET
@@ -39,136 +39,136 @@ comment "Device Selection"
 
 choice
 	prompt "AT91 device"
-	depends BR2_TARGET_AT91
+	depends on BR2_TARGET_AT91
 	default BR2_TARGET_AT91SAM9260
 	help
 	  Select the specific AT91 chip you wish to use.
 
 config BR2_TARGET_AT91RM9200
 	bool "Atmel AT91RM9200 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_LCD
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_LCD
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
 	help
 	  Atmel AT91RM9200 ARM based systems
 
 config BR2_TARGET_AT91SAM9260
 	bool "Atmel AT91SAM9260 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_LCD
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_LCD
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
 	help
 	  Atmel AT91SAM9260 ARM based systems
 
 config BR2_TARGET_AT91SAM9G20
 	bool "Atmel AT91SAM9G20 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_LCD
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_LCD
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9G20 ARM based systems (Not Yet Implemented)
 
 config BR2_TARGET_AT91SAM9261
 	bool "Atmel AT91SAM9261 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_NET
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_NET
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
 	help
 	  Atmel AT91SAM9261 ARM based systems
 
 config BR2_TARGET_AT91SAM9261S
 	bool "Atmel AT91SAM9261S Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_NET
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_NET
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9261 ARM based systems (Not Yet Implemented)
 
 config BR2_TARGET_AT91SAM9RL64
 	bool "Atmel AT91SAM9RL64 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_NET
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_NET
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9RL64 ARM based systems (Not Yet Implemented)
 
 config BR2_TARGET_AT91SAM9263
 	bool "Atmel AT91SAM9263 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
 	help
 	  Atmel AT91SAM9263 ARM based systems
 
 config BR2_TARGET_AT91SAM9G41
 	bool "Atmel AT91SAM9G41 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9G41 ARM based systems
 
 config BR2_TARGET_AT91SAM9M10
 	bool "Atmel AT91SAM9M10 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9M10 ARM based systems
 
 config BR2_TARGET_AT91SAM9M11
 	bool "Atmel AT91SAM9M11 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9M11 ARM based systems
 
 config BR2_TARGET_AT91SAM9XE
 	bool "Atmel AT91SAM9XE Microprocessors"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_LCD
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_LCD
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91SAM9263 ARM based systems (Not Yet Implemented)
 
 config BR2_TARGET_AT572D940HF
 	bool "Atmel AT572D940HF Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_LCD
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_LCD
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT572D940 ARM based systems
 
 config BR2_TARGET_AT91CAP9
 	bool "Atmel AT91CAP9 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel AT91CAP9 ARM based systems
 
 config BR2_TARGET_AT91SAM9262
 	bool "Atmel ATR0663 Microprocessor"
-	depends BR2_TARGET_AT91
-	depends !BR2_TARGET_ATMEL_FPDSP
-	depends !BR2_TARGET_ATMEL_MPB
-	depends ! BR2_TARGET_AT91_ADVANCED_INFO
+	depends on BR2_TARGET_AT91
+	depends on !BR2_TARGET_ATMEL_FPDSP
+	depends on !BR2_TARGET_ATMEL_MPB
+	depends on ! BR2_TARGET_AT91_ADVANCED_INFO
 	help
 	  Atmel ATR0663 ARM based systems (Not Yet Implemented)
 
@@ -178,92 +178,92 @@ comment "Development Board Selection"
 
 choice
 	prompt "Development Board support"
-	depends BR2_TARGET_AT91
+	depends on BR2_TARGET_AT91
 	default BR2_TARGET_AT91SAM9260DFC
 	help
 	  Select the specific AT91 development board you wish to use.
 
 config BR2_TARGET_AT91RM9200DF
 	bool "Atmel AT91RM9200 Generic Dataflash(Card) Board Support"
-	depends BR2_TARGET_AT91RM9200
+	depends on BR2_TARGET_AT91RM9200
 	help
 	  The Atmel AT91RM9200EK Development Board using Dataflashcard
 
 config BR2_TARGET_AT91RM9200SE
 	bool "Atmel AT91RM9200 Generic Dataflash(Card) Board Support (SE)"
-	depends BR2_TARGET_AT91RM9200
+	depends on BR2_TARGET_AT91RM9200
 	help
 	  The Atmel AT91RM9200EK Development Board using Dataflashcard (SE)
 
 config BR2_TARGET_AT91RM9200EK
 	bool "Atmel AT91RM9200EK Development Board Support"
-	depends BR2_TARGET_AT91RM9200
+	depends on BR2_TARGET_AT91RM9200
 	help
 	  The Atmel AT91RM9200EK Development Board
 
 config BR2_TARGET_AT91RM9200DK
 	bool "Atmel AT91RM9200DK Development Board Support"
-	depends BR2_TARGET_AT91RM9200
+	depends on BR2_TARGET_AT91RM9200
 	help
 	  The Atmel AT91RM9200DK Development Board
 
 config BR2_TARGET_AT91SAM9260DFC
 	bool "Atmel AT91SAM9260DFC"
-	depends BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE
+	depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE
 	help
 	  The Atmel AT91SAM9260 Development Board booting from Dataflashcard
 
 config BR2_TARGET_AT91SAM9260EK
 	bool "Atmel AT91SAM9260EK"
-	depends BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE
+	depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE
 	help
 	  The Atmel AT91SAM9260 Development Board booting from dataflash
 
 config BR2_TARGET_AT91SAM9XEEK
 	bool "Atmel AT91SAM9XE-EK"
-	depends BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE
+	depends on BR2_TARGET_AT91SAM9260 || BR2_TARGET_AT91SAM9G20 || BR2_TARGET_AT91SAM9XE
 	help
 	  The Atmel AT91SAM9xe Development Board (Not Yet Implemented)
 
 config BR2_TARGET_AT91SAM9261EK
 	bool "Atmel AT91SAM9261EK"
-	depends BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S
+	depends on BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S
 	help
 	  The Atmel AT91SAM9261 Development Board
 
 config BR2_TARGET_AT91SAM9RL64EK
 	bool "Atmel AT91SAM9RL64EK"
-	depends BR2_TARGET_AT91SAM9RL64
+	depends on BR2_TARGET_AT91SAM9RL64
 	help
 	  The Atmel AT91SAM9RL64 Development Board
 
 config BR2_TARGET_AT91SAM9262EK
 	bool "Atmel AT91SAM9262EK"
-	depends BR2_TARGET_AT91SAM9262
+	depends on BR2_TARGET_AT91SAM9262
 	help
 	  The Atmel AT91SAM9262 Development Board (Not Yet Implemented)
 
 config BR2_TARGET_AT91SAM9263EK
 	bool "Atmel AT91SAM9263EK"
-	depends BR2_TARGET_AT91SAM9263
+	depends on BR2_TARGET_AT91SAM9263
 	help
 	  The Atmel AT91SAM9263 Development Board (Not Yet Implemented)
 
 config BR2_TARGET_AT572D940DCM
 	bool "Atmel AT572D940 Diopsis Computer Module"
-	depends BR2_TARGET_AT572D940HF
+	depends on BR2_TARGET_AT572D940HF
 	help
 	  The Atmel Diopsis CPU Module (Not Yet Implemented)
 
 config BR2_TARGET_AT91CAP9DK
 	bool "Atmel AT91CAP9DK"
-	depends BR2_TARGET_AT91CAP9
+	depends on BR2_TARGET_AT91CAP9
 	help
 	  The Atmel AT91CAP9 Development Kit (Not Yet Implemented)
 
 config BR2_TARGET_AT91CAP9STK
 	bool "Atmel AT91CAP9STK"
-	depends BR2_TARGET_AT91CAP9
+	depends on BR2_TARGET_AT91CAP9
 	help
 	  The Atmel AT91CAP9 Starter Kit (Not Yet Implemented)
 
@@ -271,20 +271,20 @@ endchoice
 
 choice
 	prompt "SPI Mode"
-	depends BR2_TARGET_AT91SAM9261EK
+	depends on BR2_TARGET_AT91SAM9261EK
 	default BR2_TARGET_AT91SAM9261EK_SPIMODE0
 	help
 	  Select SPI Mode 0 or 3
 
 config BR2_TARGET_AT91SAM9261EK_SPIMODE0
 	bool "SPI Mode 0"
-	depends BR2_TARGET_AT91SAM9261EK
+	depends on BR2_TARGET_AT91SAM9261EK
 	help
 	  Use SPI Mode 0, Required for AT45DB642D chips
 
 config BR2_TARGET_AT91SAM9261EK_SPIMODE3
 	bool "SPI Mode 3"
-	depends BR2_TARGET_AT91SAM9261EK
+	depends on BR2_TARGET_AT91SAM9261EK
 	help
 	  Use SPI Mode 3
 
diff --git a/target/device/Atmel/AVR32_Config.in b/target/device/Atmel/AVR32_Config.in
index 6bbb02142..5be23e703 100644
--- a/target/device/Atmel/AVR32_Config.in
+++ b/target/device/Atmel/AVR32_Config.in
@@ -1,74 +1,74 @@
 comment "Atmel AVR32 Specific Device Support"
-	depends BR2_avr32
+	depends on BR2_avr32
 
 config BR2_TARGET_AVR32
 	bool "Board support for the Atmel AP7 microprocessors"
-	depends BR2_avr32
+	depends on BR2_avr32
 	default n
 	help
 	  Atmel AT32AP7XXX AVR32 based systems
 
 choice
 	prompt "AVR32 device"
-	depends BR2_TARGET_AVR32
+	depends on BR2_TARGET_AVR32
 	default BR2_TARGET_AT32AP7000
 	help
 	  Select the specific AVR32 chip you wish to use.
 
 config BR2_TARGET_AT32AP7000
 	bool "Board support for the Atmel AT32AP7000 Microprocessor"
-	depends BR2_TARGET_AVR32
+	depends on BR2_TARGET_AVR32
 	help
 	  Atmel AT32AP7000 AVR32 based systems
 
 config BR2_TARGET_AT32AP7001
 	bool "Board support for the Atmel AT32AP7001 Microprocessor"
-	depends BR2_TARGET_AVR32
+	depends on BR2_TARGET_AVR32
 	help
 	  Atmel AT32AP7001 AVR32 based systems
 
 config BR2_TARGET_AT32AP7002
 	bool "Board support for the Atmel AT32AP7002 Microprocessor"
-	depends BR2_TARGET_AVR32
+	depends on BR2_TARGET_AVR32
 	help
 	  Atmel AT32AP7002 AVR32 based systems
 
 endchoice
 
 comment "Development board support"
-	depends BR2_TARGET_AVR32
+	depends on BR2_TARGET_AVR32
 
 choice
 	prompt "Development board support"
-	depends BR2_TARGET_AVR32
+	depends on BR2_TARGET_AVR32
 	default BR2_TARGET_AVR32_ATSTK1000
 	help
 	  Select the specific AVR32 development board you wish to use.
 
 config BR2_TARGET_AVR32_ATSTK1002
 	bool "Atmel ATSTK1000/2 AVR32 development board support"
-	depends BR2_TARGET_AT32AP7000
+	depends on BR2_TARGET_AT32AP7000
 	select BR2_PACKAGE_LINUX
 	help
 	  The Atmel ATSTK1000 AVR32 Development Board.
 
 config BR2_TARGET_AVR32_ATNGW100
 	bool "Atmel AVR32 network gateway board support"
-	depends BR2_TARGET_AT32AP7000
+	depends on BR2_TARGET_AT32AP7000
 	select BR2_PACKAGE_LINUX
 	help
 	  The Atmel AVR32 Network Gateway Board.
 
 config BR2_TARGET_AVR32_ATNGW100_BASE
 	bool "Atmel AVR32 basic network gateway board support"
-	depends BR2_TARGET_AT32AP7000
+	depends on BR2_TARGET_AT32AP7000
 	select BR2_PACKAGE_LINUX
 	help
 	  Very simple configuration for the Atmel AVR32 Network Gateway Board.
 
 config BR2_TARGET_AVR32_ATNGW100_EXPANDED
 	bool "Atmel AVR32 expanded network gateway board support"
-	depends BR2_TARGET_AT32AP7000
+	depends on BR2_TARGET_AT32AP7000
 	select BR2_PACKAGE_LINUX
 	help
 	  The Atmel AVR32 Network Gateway Board expanded to include audio, video, and PS/2.
diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in
index 676a2da0d..cd710f6df 100644
--- a/target/device/Atmel/Config.in
+++ b/target/device/Atmel/Config.in
@@ -27,7 +27,7 @@ config BR2_BOARD_NAME
 
 config BR2_TARGET_AT91_ADVANCED_INFO
 	bool "Remove work in progress"
-	depends BR2_TARGET_AT91
+	depends on BR2_TARGET_AT91
 	default y
 	help
 	  Atmel AT91 ARM based systems
diff --git a/target/device/Atmel/at91bootstrap/Config.in b/target/device/Atmel/at91bootstrap/Config.in
index 3e53d3e6b..758e0d0b8 100644
--- a/target/device/Atmel/at91bootstrap/Config.in
+++ b/target/device/Atmel/at91bootstrap/Config.in
@@ -43,7 +43,7 @@ config	BR2_AT91BOOTSTRAP_IMG_SIZE
 	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASH || BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	default	"0x30000"	if	BR2_TARGET_AT91BOOT_NANDFLASH
 	default	"0x100000"	if	BR2_TARGET_AT91BOOT_FLASH
-	depends BR2_TARGET_AT91BOOTSTRAP
+	depends on BR2_TARGET_AT91BOOTSTRAP
 	help
 	  Select the size of your application
 	  AT91 Bootstrap will copy this amount from flash to SDRAM
diff --git a/target/device/Hitachi/Config.in b/target/device/Hitachi/Config.in
index 8048e8508..60341880a 100644
--- a/target/device/Hitachi/Config.in
+++ b/target/device/Hitachi/Config.in
@@ -1,5 +1,5 @@
 comment "Hitachi ULSI Systems device support"
-	depends BR2_sh
+	depends on BR2_sh
 
 config BR2_TARGET_HITACHI_SE
 	bool "Board support for Solution Engine development boards"
@@ -8,5 +8,5 @@ config BR2_TARGET_HITACHI_SE
 
 config BR2_TARGET_HITACHI_MS7206SE01
 	bool "MS7206SE01 development board support"
-	depends BR2_TARGET_HITACHI_SE && BR2_sh2a_nofpueb
+	depends on BR2_TARGET_HITACHI_SE && BR2_sh2a_nofpueb
 	default n
diff --git a/target/device/Sharp/Config.in b/target/device/Sharp/Config.in
index 6a385c3a9..6c750420f 100644
--- a/target/device/Sharp/Config.in
+++ b/target/device/Sharp/Config.in
@@ -5,11 +5,11 @@ menuconfig BR2_TARGET_SHARP
 
 if BR2_TARGET_SHARP
 comment "Sharp Specific Device Support"
-	depends BR2_arm
+	depends on BR2_arm
  
 config BR2_TARGET_SHARP_LNODE80
 	bool "Board support for the LNode80 development board"
-	depends BR2_arm
+	depends on BR2_arm
 	default n
 	help
 	  Support for the LNode80 LH79520 based device
diff --git a/target/device/Soekris/Config.in b/target/device/Soekris/Config.in
index 925b3e5dd..54cc152a8 100644
--- a/target/device/Soekris/Config.in
+++ b/target/device/Soekris/Config.in
@@ -1,6 +1,6 @@
 menuconfig BR2_TARGET_SOEKRIS
 	bool "Soekris device support"
-	depends BR2_i386
+	depends on BR2_i386
 	default n
 
 if BR2_TARGET_SOEKRIS
@@ -13,7 +13,7 @@ config BR2_TARGET_SOEKRIS_NET4521
 
 config BR2_TARGET_SOEKRIS_NET4801
 	bool "Soekris net4801"
-	depends BR2_i386
+	depends on BR2_i386
 	default n
 	select BR2_PACKAGE_LINUX
 	help
diff --git a/target/device/Via/Config.in b/target/device/Via/Config.in
index 8d7f269fe..036e159bb 100644
--- a/target/device/Via/Config.in
+++ b/target/device/Via/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_VIA_EPIA_MII
 	bool "EPIA MII"
-	depends BR2_i386
+	depends on BR2_i386
 	default n
 	select BR2_PACKAGE_LINUX
 	help
diff --git a/target/device/jp/Config.in b/target/device/jp/Config.in
index ca382c8d5..da2d3e60f 100644
--- a/target/device/jp/Config.in
+++ b/target/device/jp/Config.in
@@ -1,11 +1,11 @@
 config BR2_TARGET_Q5
 	bool "jp-embedded Q5 board support"
 	default n
-	depends BR2_mipsel
+	depends on BR2_mipsel
 	select BR2_PACKAGE_LINUX
 	help
 	  jp-embedded Q5 series MIPS based boards, see http://www.jp-embedded.com for further information.
 
 comment "Package support"
-	depends BR2_TARGET_Q5
+	depends on BR2_TARGET_Q5
 
diff --git a/target/device/valka/Config.in b/target/device/valka/Config.in
index 8bc816e0a..c0663e9aa 100644
--- a/target/device/valka/Config.in
+++ b/target/device/valka/Config.in
@@ -7,13 +7,13 @@ if BR2_TARGET_VALKA
 
 choice
 	prompt "Controller board"
-	depends BR2_TARGET_VALKA
+	depends on BR2_TARGET_VALKA
 	help
 	  Valka Controller Board to build for
 
 config BR2_TARGET_VALKA_V100SC2
 	bool "V100SC2 (Based on NGW100)"
-	depends BR2_TARGET_VALKA
+	depends on BR2_TARGET_VALKA
 	help
 	  Board based on NGW100
 
diff --git a/target/device/x86/Config.in b/target/device/x86/Config.in
index 630795347..2895872eb 100644
--- a/target/device/x86/Config.in
+++ b/target/device/x86/Config.in
@@ -1,6 +1,6 @@
 comment "Generic x86 Device Support"
-	depends BR2_i386
+	depends on BR2_i386
 
 comment "Package support"
-	depends BR2_TARGET_AMD_ALCHEMY
+	depends on BR2_TARGET_AMD_ALCHEMY
 
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index cd58a4abb..6ea223f89 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -419,13 +419,13 @@ config BR2_PACKAGE_LINUX_USE_KCONFIG
 
 config BR2_PACKAGE_LINUX_USE_DEFCONFIG
 	bool "Run make <board>_defconfig "
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make <board>_defconfig
 
 config BR2_PACKAGE_LINUX_USE_XCONFIG
 	bool "Run make ARCH=$(ARCH) [xconfig|menuconfig] before build"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make xconfig
 endchoice
@@ -478,31 +478,31 @@ choice
 
 config BR2_LINUX_BIN_BZIMAGE
 	bool "bzImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_UIMAGE
 	bool "uImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build uImage binary
 
 config BR2_LINUX_BIN_VMLINUX
 	bool "vmlinux"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build vmlinux binary
 
 config BR2_LINUX_BIN_ZIMAGE
 	bool "zImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_CUSTOM
 	bool "<custom> Linux binary"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build custom Linux binary format
 endchoice
@@ -544,7 +544,7 @@ menu "Destinations for linux kernel binaries"
 
 config BR2_LINUX_COPYTO_ROOTFS
 	bool "Copy kernel to root file system"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	default n
 	help
 	  Copy kernel to <root>/boot directory
diff --git a/target/linux/Config.in.experimental b/target/linux/Config.in.experimental
index 92ffc9e4f..a7f758659 100644
--- a/target/linux/Config.in.experimental
+++ b/target/linux/Config.in.experimental
@@ -10,115 +10,115 @@ choice
 
 config BR2_LINUX_2_6_SNAP
 	bool "The latest snapshot for the stable Linux kernel"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.x-git#
 
 config BR2_LINUX_2_6_MM
 	bool "With latest -mm patch for the stable Linux kernel"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.x-rc#-mm#
 
 config BR2_LINUX_2_6_STABLE
 	bool "The latest stable Linux kernel (2.6.22.1)"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22.1
 
 config BR2_LINUX_2_6_22_10
 	bool "Linux 2.6.22.10"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22.10
 
 config BR2_LINUX_2_6_22_1
 	bool "Linux 2.6.22.1"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22.1
 
 config BR2_LINUX_2_6_22
 	bool "Linux 2.6.22"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.22
 
 config BR2_LINUX_2_6_21_6
 	bool "Linux 2.6.21.6"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.21.6
 
 config BR2_LINUX_2_6_21_1
 	bool "Linux 2.6.21.1"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.21.1
 
 config BR2_LINUX_2_6_21
 	bool "Linux 2.6.21"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.21
 
 config BR2_LINUX_2_6_20_4
 	bool "Linux 2.6.20.4"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.20.4
 
 config BR2_LINUX_2_6_20
 	bool "Linux 2.6.20"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.20
 
 config BR2_LINUX_2_6_19_2
 	bool "Linux 2.6.19.2"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_2_6_19
 	bool "Linux 2.6.19"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19
 
 config BR2_LINUX_2_6_18
 	bool "Linux 2.6.18"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.18
 
 config BR2_LINUX_2_6_17
 	bool "Linux 2.6.17"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.17
 
 config BR2_LINUX_2_6_16
 	bool "Linux 2.6.16"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.16
 
 config BR2_LINUX_2_6_15
 	bool "Linux 2.6.15"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.15
 
 config BR2_LINUX_2_6_23
 	bool "Linux 2.6.23"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.23
 
 config BR2_LINUX_CUSTOM
 	bool "Linux <custom> version"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux <your selection>
 
@@ -228,13 +228,13 @@ config BR2_PACKAGE_LINUX_USE_KCONFIG
 
 config BR2_LINUX26_DEFCONFIG
 	bool "Run make <board>_defconfig "
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make <board>_defconfig
 
 config BR2_LINUX_CUSTOMIZE
 	bool "Run make ARCH=$(ARCH) xconfig before build"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Configure Linux by make xconfig
 endchoice
@@ -259,31 +259,31 @@ choice
 
 config BR2_LINUX_BIN_BZIMAGE
 	bool "bzImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_UIMAGE
 	bool "uImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build uImage binary
 
 config BR2_LINUX_BIN_VMLINUX
 	bool "vmlinux"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build vmlinux binary
 
 config BR2_LINUX_BIN_ZIMAGE
 	bool "zImage"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Linux 2.6.19.2
 
 config BR2_LINUX_BIN_CUSTOM
 	bool "<custom> Linux binary"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	help
 	  Build custom Linux binary format
 endchoice
@@ -326,7 +326,7 @@ comment "Destinations for linux kernel binaries"
 
 config BR2_LINUX_IN_ROOTFS
 	bool "Copy kernel to root file system"
-	depends BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX
 	default n
 	help
 	  Copy kernel to <root>/boot directory
@@ -338,7 +338,7 @@ menuconfig BR2_LINUX_COPY
 
 config BR2_LINUX_COPYTO
 	string "also copy the image to..."
-	depends BR2_LINUX_COPY
+	depends on BR2_LINUX_COPY
 	default "/tftpboot"
 	help
 	  Copy kernel to secondary location
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index c44bb449b..8661bd777 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -9,20 +9,20 @@ choice
 	  Select the version of binutils you wish to use.
 
 	config BR2_BINUTILS_VERSION_2_17
-		depends BR2_avr32 || !BR2_nios2 && BR2_DEPRECATED
-		depends BR2_EXT_BINUTILS_VERSION_2_17
+		depends on BR2_avr32 || !BR2_nios2 && BR2_DEPRECATED
+		depends on BR2_EXT_BINUTILS_VERSION_2_17
 		bool "binutils 2.17"
 
 	config BR2_BINUTILS_VERSION_2_17_50_0_17
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "binutils 2.17.50.0.17"
 
 	config BR2_BINUTILS_VERSION_2_18
-		depends !BR2_avr32 && !BR2_nios2
+		depends on !BR2_avr32 && !BR2_nios2
 		bool "binutils 2.18"
 
 	config BR2_BINUTILS_VERSION_2_18_50_0_1
-		depends !BR2_avr32 && !BR2_nios2
+		depends on !BR2_avr32 && !BR2_nios2
 		bool "binutils 2.18.50.0.1"
 endchoice
 
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 12d9010dc..0cd6f97a8 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -43,7 +43,7 @@ choice
 		bool "gcc 4.3.1"
 
 #	config BR2_GCC_VERSION_4_3
-#		depends !BR2_avr32 && !BR2_nios2
+#		depends on !BR2_avr32 && !BR2_nios2
 #		select BR2_GCC_IS_SNAP
 #		bool "gcc 4.3"
 endchoice
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index f6a3f8196..5b51b6e2c 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -17,67 +17,67 @@ choice
 	  linux-2.6.tar.bz2 tarball in your download dir.
 
 	config BR2_KERNEL_HEADERS_2_4_25
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.4.25 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_4_27
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.4.27 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_4_29
-		depends !BR2_avr32 && !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.4.29 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_4_31
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.4.31 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_9
-		depends !BR2_avr32 && BR2_DEPRECATED
+		depends on !BR2_avr32 && BR2_DEPRECATED
 		bool "Linux 2.6.9 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_11
-		depends !BR2_avr32 && BR2_DEPRECATED
+		depends on !BR2_avr32 && BR2_DEPRECATED
 		bool "Linux 2.6.11 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_12
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.12 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_20_4
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.20.4 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_20
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.20.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_21_5
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.21.5 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_21
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.21.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_22_1
-		depends !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.22.1 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_22_10
-		depends !BR2_nios2 && BR2_DEPRECATED
+		depends on !BR2_nios2 && BR2_DEPRECATED
 		bool "Linux 2.6.22.10 kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_22
-		depends BR2_DEPRECATED
+		depends on BR2_DEPRECATED
 		bool "Linux 2.6.22.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_23
-		depends BR2_DEPRECATED
+		depends on BR2_DEPRECATED
 		bool "Linux 2.6.23.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_24
-		depends BR2_RECENT
+		depends on BR2_RECENT
 		bool "Linux 2.6.24.x kernel headers"
 
 	config BR2_KERNEL_HEADERS_2_6_25
@@ -91,14 +91,14 @@ endchoice
 config BR2_KERNEL_HEADERS_IPMI
 	bool "use ipmi kernel patches"
 	default n
-	depends BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
+	depends on BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
 	help
 	  Apply patches which add IPMI sensor support.
 
 config BR2_KERNEL_HEADERS_LZMA
 	bool "use lzma initramfs kernel patches"
 	default n
-	depends BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
+	depends on BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
 	help
 	  Apply patches which allow for lzma compressed
 	  initramfs filesystems.  This requires the lzma
@@ -107,14 +107,14 @@ config BR2_KERNEL_HEADERS_LZMA
 config BR2_KERNEL_HEADERS_RT
 	bool "use realtime (-rt) kernel patches"
 	default n
-	depends BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
+	depends on BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
 	help
 	  Apply Ingo's realtime extensions to linux
 
 config BR2_KERNEL_HEADERS_PATCH_DIR
 	bool "Add additional headers from $(KERNEL_HEADERS_PATCH_DIR)"
 	default n
-	depends BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1  || BR2_KERNEL_HEADERS_2_6_22_10
+	depends on BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1  || BR2_KERNEL_HEADERS_2_6_22_10
 	help
 	  Apply additional kernel patches defined by KERNEL_HEADERS_PATCH_DIR
 	  in your board directory.
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index f81373df1..fdf35b5be 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -10,13 +10,13 @@ choice
 	  Select the version of uClibc you wish to use.
 
 	config BR2_UCLIBC_VERSION_0_9_28_3
-		depends BR2_DEPRECATED
+		depends on BR2_DEPRECATED
 		bool "uClibc 0.9.28.3"
-		depends BR2_EXT_UCLIBC_VERSION_0_9_28_3
+		depends on BR2_EXT_UCLIBC_VERSION_0_9_28_3
 
 	config BR2_UCLIBC_VERSION_0_9_29
 		bool "uClibc 0.9.29"
-		depends BR2_EXT_UCLIBC_VERSION_0_9_29
+		depends on BR2_EXT_UCLIBC_VERSION_0_9_29
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"