diff --git a/make/environment.mk b/make/environment.mk
index 22343a2a..a95fc6d5 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -174,7 +174,7 @@ endif
 TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) -g -I$(TARGETINCLUDE)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
-TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 $(TARGET_EXTRA_LDFLAGS) -L$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB)
+TARGET_LDFLAGS  = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) -L$(TARGETLIB) $(TARGET_EXTRA_LDFLAGS)
 
 VPATH = $(D)
 
@@ -213,9 +213,11 @@ CONFIGURE_OPTS = \
 BUILDENV = \
 	CC=$(TARGET)-gcc \
 	CXX=$(TARGET)-g++ \
+	LD=$(TARGET)-ld \
 	NM=$(TARGET)-nm \
 	AR=$(TARGET)-ar \
 	AS=$(TARGET)-as \
+	LDD=$(TARGET)-ldd \
 	RANLIB=$(TARGET)-ranlib \
 	STRIP=$(TARGET)-strip \
 	OBJCOPY=$(TARGET)-objcopy \
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 58ab0a50..9e2443d1 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -31,7 +31,6 @@ $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGETPREFIX)
 			--disable-static \
 			--disable-example \
 			--disable-mtab \
-			--disable-rpath \
 			--with-gnu-ld \
 			--enable-util \
 			--enable-lib \
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 76269238..55064452 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -29,13 +29,16 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
 	$(UNTAR)/openssh-$(OPENSSH_VER).tar.gz
 	cd $(BUILD_TMP)/openssh-$(OPENSSH_VER) && \
 	export ac_cv_search_dlopen=no && \
-	$(CONFIGURE) \
+	./configure \
+		$(CONFIGURE_OPTS) \
 		--prefix= \
 		--mandir=/.remove \
 		--docdir=/.remove \
 		--infodir=/.remove \
 		--with-pid-dir=/tmp \
 		--with-privsep-path=/var/empty \
+		--with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGETINCLUDE)" \
+		--with-ldflags="-L$(TARGETLIB)" \
 		--libexecdir=/bin \
 		--disable-strip \
 		--disable-lastlog \
@@ -878,7 +881,6 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGETPREFIX)
 			--disable-libasprintf \
 			--disable-acl \
 			--disable-openmp \
-			--disable-rpath \
 			--disable-java \
 			--disable-native-java \
 			--disable-csharp \
@@ -941,7 +943,6 @@ $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGETPREFIX)
 			--mandir=/.remove \
 			--with-gnu-ld \
 			--with-ssl=openssl \
-			--disable-rpath \
 			--disable-debug \
 			&& \
 		$(MAKE) && \
@@ -962,7 +963,6 @@ $(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
 			--enable-static \
 			--disable-shared \
 			--enable-relocatable \
-			--disable-rpath \
 			--datarootdir=/.remove && \
 		$(MAKE) && \
 	$(MAKE) install DESTDIR=$(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp