diff --git a/app-arch/tar/tar-1.25.bep b/app-arch/tar/tar-1.25.bep
index 04d0e735f..ba2673ca5 100644
--- a/app-arch/tar/tar-1.25.bep
+++ b/app-arch/tar/tar-1.25.bep
@@ -19,7 +19,7 @@ BUILD {
 	./configure --prefix=/boot/common \
 		--infodir=$COMMON_DOCS/info \
 		--libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \
-		--sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
 		LDFLAGS="-lnetwork" \
 		FORCE_UNSAFE_CONFIGURE=1
 	make
diff --git a/dev-libs/apr-util/apr-util-1.3.10.bep b/dev-libs/apr-util/apr-util-1.3.10.bep
index 749f67e6e..5f4573843 100644
--- a/dev-libs/apr-util/apr-util-1.3.10.bep
+++ b/dev-libs/apr-util/apr-util-1.3.10.bep
@@ -38,8 +38,8 @@ BUILD {
 	ln -sf /boot/common/bin/libtool ./libtool 
     ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
+		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
 		--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
 		--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
 		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
diff --git a/dev-libs/apr/apr-1.4.2.bep b/dev-libs/apr/apr-1.4.2.bep
index e02c76a74..ecb01156c 100644
--- a/dev-libs/apr/apr-1.4.2.bep
+++ b/dev-libs/apr/apr-1.4.2.bep
@@ -14,8 +14,8 @@ BUILD {
 	ln -sf /boot/common/bin/libtool /libtool 
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
+		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
 		--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
 		--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
 		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
diff --git a/dev-vcs/git/git-1.7.3.5.bep b/dev-vcs/git/git-1.7.3.5.bep
index 4d040fe27..50b4b5e27 100644
--- a/dev-vcs/git/git-1.7.3.5.bep
+++ b/dev-vcs/git/git-1.7.3.5.bep
@@ -15,7 +15,7 @@ BUILD {
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
 		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
 		sharedir=`finddir B_COMMON_DATA_DIRECTORY` \
 		--with-editor=nano \
 		--enable-pthreads \
diff --git a/sys-apps/gawk/gawk-3.1.8.bep b/sys-apps/gawk/gawk-3.1.8.bep
index 58c69266c..b3c8cdc4e 100644
--- a/sys-apps/gawk/gawk-3.1.8.bep
+++ b/sys-apps/gawk/gawk-3.1.8.bep
@@ -10,7 +10,7 @@ BUILD {
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
 		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
diff --git a/sys-apps/xinetd/xinetd-2.3.14.bep b/sys-apps/xinetd/xinetd-2.3.14.bep
index 1e4318b45..4957efced 100644
--- a/sys-apps/xinetd/xinetd-2.3.14.bep
+++ b/sys-apps/xinetd/xinetd-2.3.14.bep
@@ -21,18 +21,18 @@ BUILD {
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_SERVERS_DIRECTORY`
+	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man8
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 }
 
 INSTALL {
 	cd xinetd-2.3.14
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_SERVERS_DIRECTORY`
+	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man8
 	make install DESTDIR=${DESTDIR}
diff --git a/www-servers/apache/apache-2.2.17.bep b/www-servers/apache/apache-2.2.17.bep
index b51ecbfa5..201911275 100644
--- a/www-servers/apache/apache-2.2.17.bep
+++ b/www-servers/apache/apache-2.2.17.bep
@@ -12,7 +12,7 @@ BUILD {
 	aclocal
 	autoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
 		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
 		--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`
 	make