diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -5,7 +5,6 @@ AUX busybox-1.18.0-bb.patch 918 RMD160 e
 AUX busybox-1.18.1-bzip2.patch 1215 RMD160 48e7f2554f13aee61b9e529100df024bf8fe2aaf SHA1 2eb3bf3803f997ce5929b6dc174dc0c5574346a2 SHA256 b91ec72c68961454f4b2cd19b2b4e13bf01650050c69f3875a48003f0740615f
 AUX busybox-1.18.1-cpio.patch 916 RMD160 fddcc3ee74a745634c3341d792c130bbbead0bf6 SHA1 1a2c0145d05b4c01b046fcd3ec29be3127f8eeb5 SHA256 b97aa58fa5925cd2fa59b178e33eaa86d5e6633c8c4522bc11f384ba60d33eb3
 AUX busybox-1.18.1-hush.patch 8447 RMD160 890c9fc9cc4a47389f5a36e52316e6863791fc60 SHA1 119a025215a70f8e41dcca1e81c93d1894f3679d SHA256 d6a066e2f606559f1cd036e7bcbaf555b1d7df8a924804eca6996bc535e44dbf
-AUX busybox-1.18.1-ldflags.patch 3614 RMD160 7f27232505103301aa46e2df754292fee7db93f8 SHA1 424de3c85f0da0e06bfc044450b26c10eb694a28 SHA256 7a66a5ac4fbca0d30a7e1a25c72775be9f2eff50fc1b6c765f769714e9056682
 AUX busybox-1.18.1-mkswap.patch 504 RMD160 9fbecd5d82ae1d3198acd365e411572bae90dbd3 SHA1 7d5560ca68a5f2f53f573c784929f710b87f5c9d SHA256 8cbf49401fafaf35be70ba414cab0d68c7c88b1d0a6bbb5b00d0dc27621accfa
 AUX busybox-1.18.1-warning.patch 913 RMD160 6b688c0561d7d059c7693b24575a103bb9bf978a SHA1 742d459957500551f24be81845b861994bb50c48 SHA256 95df2c2e95c6e0a3a2275d8c9b0958894f4b315666f0407e4f4c9c9dc0b47109
 AUX busybox-1.18.3-buildsys.patch 320 RMD160 5591dc086f5c2d060b0c6e8496df8515ec1dccc8 SHA1 12bd93ead0022a8e80a7d3c40f1f6b166cc3942f SHA256 cb438f0a5c46125387187b4a2389d56f7aa8db5a308aed314f5866cf9a09b72b
@@ -19,23 +18,23 @@ AUX mdev/usbdev 1624 RMD160 a448558f0585
 AUX mdev/usbdisk_link 984 RMD160 9b86d85f5f27f03f894a062c9f00d3583c4db3ae SHA1 690290b25fa1b90f6d9d7b8947a55746920991a4 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858
 DIST busybox-1.18.1.tar.bz2 2129404 RMD160 fb40d19103945eb1cd785a6041e5545f4055b8f6 SHA1 83b86858599870e46236da8d370d335d48cee77e SHA256 33eb25ea7b20c727c3af769256b21408a1ac1f927ff9f89a1f1e3767c18c9967
 DIST busybox-1.18.3.tar.bz2 2119251 RMD160 b38e5bc8ca9d586dd1528080b6a866ad8719a31a SHA1 4debdbdf8abb7ae54e0c0e2650cb03d957400533 SHA256 83f112ee88b7eb85bea1cac0b1af33f61387a1036f1898c5ecd79813191a619b
-EBUILD busybox-1.18.1-r1.ebuild 7878 RMD160 bffa2b8a14b89e73284465fab69843a6c64bc59b SHA1 50f602ebad143a95e8c264391bf97d5ddf8a2150 SHA256 a227375d847bec70e835e060ffb8d4d0c7c570473f157970135b272f26710b4d
-EBUILD busybox-1.18.3.ebuild 7923 RMD160 70a7319bcda540bbccb5264cdd218384540aa4c5 SHA1 1ce5019a08595955bd446341af6bb985ae9d347b SHA256 b98879df777c471d1afdac749fdfb139df04b2fa995d0f0795c456be9b3cf53d
+EBUILD busybox-1.18.1-r1.ebuild 7841 RMD160 db5fd3766fbf57393957b9f01ea2a992b67ed0eb SHA1 128a5620e0e884450d74b9fefa489c9703c04f4a SHA256 19c172db80528aedc28d1d6e2d0b12c9d6e70764f7a6916ca13a238d824543ed
+EBUILD busybox-1.18.3.ebuild 7841 RMD160 db5fd3766fbf57393957b9f01ea2a992b67ed0eb SHA1 128a5620e0e884450d74b9fefa489c9703c04f4a SHA256 19c172db80528aedc28d1d6e2d0b12c9d6e70764f7a6916ca13a238d824543ed
 MISC metadata.xml 368 RMD160 2facee7f44b7469c85383961c2dd4338ea6fffcb SHA1 eae78f6b5eb3a21aeae692f9a7420ab536be3739 SHA256 033b1cb2abe759f73b184ce43b5c791454716638090767c2bc70cc52b4ef187f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNeFGCAAoJEHQ6UuhrqBBQgd8P/iXBkSSbLxKTXjuPZCIMG9b0
-kcDWv47ZdgxByPgjeQub3PlxRz8Ab++x4cu6NYi8mR7H9p3BiG1DMSu/s9pZvhEK
-e9/P9C/ZfVQcbDIof+RkaOfY1SCEuAwRTB8qABFRlPldTRjO8XGP94VAblXFbvMr
-x9L4o5q1Q+ESYrxR6ddSyM7KJ0jc1dDH0USuCNwpWxFto6jX+vrcrG0kjSCTZJ5U
-bL88zQMLwSRKgfUlpahVOojaTV4RLPZvTNL1X3y/1lla4edRrBAvmAJ8laWGRi+F
-tcKJIlTaWe0fy3I5YSjsiSzF1QYt2isBw+1Y1w3aoBctTUFfgkPmI+UUURmjMT3P
-p5J1dr6QbcelYEIbieAaSK9VAIhXaNT5RInBLD3BsQEsvBKuNMGb4jHBafQ8ewrF
-PMi+pum9kJmdbwIVm8+UJkpzpl5j3CsxEpIzJ+9FHareleLnLRvnXZzYlB9FxSvy
-XT9whBOuP//HNhmdNxNR1KbksaMJCvbN33Ldtd/WjcrPWXTqPwXXQkI+6pe/oSHH
-LuGNUjYeflA5FrINlsX5Hhx9xu8mprgTd8xnkvz1EcOy9Zcqs2qTCEWn3tNR9/jZ
-5kq1EFG3SIdI2ta1iMZtY7qne6+/1LVrSdNcrYw7+IqAIpAktKhnE8vCIwA1ZDbv
-kehnD4AZtn0ipkCMOGdv
-=aW4J
+iQIcBAEBCAAGBQJNjooUAAoJEHQ6UuhrqBBQmDcQAJ951vUJeeSakGWvcv7ZfuE/
+Jm+thF05HtTDoY4NyTUyp3s6qo3ebgjCmzRRV20iryecpa1ark6dwX7k6Hj9aNE3
+ouHnswx2/vGHrKzXIYaYdyxZA85XW+eXUmanaGwqki3PAj7mop5Zfe2w7f/VzwWV
+9o+YCc1ICqJx9fzf17liF9tukbY5wdnC/3vuawxSLPWxC5Z1WxiWE7D8UvcxOrev
+WgGXbOIkgNNccWG9uOTgNNeC61Z8gKApZK50qZEBddNZRZqajaLIS04TUHV8hj1K
+4hxHamk6vRwGYi7wmiZ0kRiRBpmx7I78YsJYh9mBAEXu+7vvTiRrlO1s5Qqti/lD
+5YSIiYYeQ6Fsi/4pGVNk9UYMsTXpE1Rmb7hFz2MtKQGWv88o4ROGsYXeVwBaYWkX
+CIoz0VviMac4L+hUfBBuAWqtcsVdGjugCuF0qfWig5BnecGVTY2UI8Pmg4SgT/YG
+lZL1XfV/HhF7d+4QQcYr0hxJtKm+/CtgueJS5je6j0iJgP1qVrQPRmjdMcUfc2x2
+1JRb3UIV0t3ViEl4EQucHmJENPi5ceZhRbuYEqEniL6N2YVHyRyRAdTyR3Fhzaze
+IN0lO8t0jDVHTDhozqQgQ2cKUbdELW7Zg4rmH40+JhEmxgeCcybgaiaPHs96Bma+
+GdcxX8qpkqggh9aubOx9
+=eUOV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.18.1-r1.ebuild b/sys-apps/busybox/busybox-1.18.1-r1.ebuild
--- a/sys-apps/busybox/busybox-1.18.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.18.1-r1.ebuild
@@ -98,7 +98,6 @@ src_prepare() {
 		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
 		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
 		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^LD\>/s:=.*:= $(tc-getLD):" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
 		Makefile || die
 }
diff --git a/sys-apps/busybox/busybox-1.18.3.ebuild b/sys-apps/busybox/busybox-1.18.3.ebuild
--- a/sys-apps/busybox/busybox-1.18.3.ebuild
+++ b/sys-apps/busybox/busybox-1.18.3.ebuild
@@ -71,8 +71,8 @@ busybox_config_option() {
 		y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
 		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
 		*) use $1 \
-			   && busybox_config_option y $2 \
-			   || busybox_config_option n $2
+		       && busybox_config_option y $2 \
+		       || busybox_config_option n $2
 		   return 0
 		   ;;
 	esac
@@ -85,7 +85,6 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/busybox-1.18.0-bb.patch
-	epatch "${FILESDIR}"/busybox-1.18.1-ldflags.patch
 	epatch "${FILESDIR}"/busybox-${PV}-*.patch
 
 	# flag cleanup
@@ -99,7 +98,6 @@ src_prepare() {
 		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
 		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
 		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^LD\>/s:=.*:= $(tc-getLD):" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
 		Makefile || die
 }
diff --git a/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch b/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch
deleted file mode 100644
--- a/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d9204f4..e9b4700 100644
---- a/Makefile
-+++ b/Makefile
-@@ -308,7 +308,8 @@ CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C
- MODFLAGS	= -DMODULE
- CFLAGS_MODULE   = $(MODFLAGS)
- AFLAGS_MODULE   = $(MODFLAGS)
--LDFLAGS_MODULE  = -r
-+LDFLAGS_r	= -r -nostdlib
-+LDFLAGS_MODULE  = $(LDFLAGS_r)
- CFLAGS_KERNEL	=
- AFLAGS_KERNEL	=
- 
-@@ -330,7 +331,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
- export	VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
- 	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
- 	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \
--	HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
-+	HOSTCXX HOSTCXXFLAGS LDFLAGS_r LDFLAGS_MODULE CHECK CHECKFLAGS
- 
- export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
- export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
-diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index 5685b5b..5e733f8 100644
---- a/scripts/Makefile.build
-+++ b/scripts/Makefile.build
-@@ -174,7 +174,7 @@ cmd_modversions =							\
- 		| $(GENKSYMS) -a $(ARCH)				\
- 		> $(@D)/.tmp_$(@F:.o=.ver);				\
- 									\
--		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
-+		$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(@D)/.tmp_$(@F)	\
- 			-T $(@D)/.tmp_$(@F:.o=.ver);			\
- 		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	\
- 	else								\
-@@ -256,7 +256,7 @@ ifdef builtin-target
- quiet_cmd_link_o_target = LD      $@
- # If the list of objects to link is empty, just create an empty built-in.o
- cmd_link_o_target = $(if $(strip $(obj-y)),\
--		$(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
-+		$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(filter $(obj-y), $^),\
- 		rm -f $@; $(AR) rcs $@)
- 
- $(builtin-target): $(obj-y) FORCE
-@@ -291,10 +291,10 @@ $($(subst $(obj)/,,$(@:.o=-objs)))    \
- $($(subst $(obj)/,,$(@:.o=-y)))), $^)
- 
- quiet_cmd_link_multi-y = LD      $@
--cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
-+cmd_link_multi-y = $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)
- 
- quiet_cmd_link_multi-m = LD [M]  $@
--cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
-+cmd_link_multi-m = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
- 
- # We would rather have a list of rules like
- # 	foo.o: $(foo-objs)
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 3e54ea7..342b0d6 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -117,12 +117,7 @@ a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
- 
- cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)
- 
--# Seems to be a wrong thing to do. LDFLAGS contains gcc's flags,
--# yet ld_flags is fed to ld.
--#ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
--# Remove the -Wl, prefix from linker options normally passed through gcc
--ld_flags       = $(filter-out -Wl$(comma)%,$(LDFLAGS) $(EXTRA_LDFLAGS))
--
-+ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
- 
- # Finds the multi-part object the current object will be linked into
- modname-multi = $(sort $(foreach m,$(multi-used),\
-@@ -151,10 +146,8 @@ $(obj)/%:: $(src)/%_shipped
- # Linking
- # ---------------------------------------------------------------------------
- 
--# TODO: LDFLAGS usually is supposed to contain gcc's flags, not ld's.
--# but here we feed them to ld!
--quiet_cmd_ld = LD      $@
--cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
-+quiet_cmd_ld = CCLD    $@
-+cmd_ld = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_$(@F)) \
- 	       $(filter-out FORCE,$^) -o $@
- 
- # Objcopy