diff --git a/Base/bin/more b/Base/bin/more
deleted file mode 120000
index cbce297ba8..0000000000
--- a/Base/bin/more
+++ /dev/null
@@ -1 +0,0 @@
-/bin/less
\ No newline at end of file
diff --git a/Base/usr/bin/env b/Base/usr/bin/env
deleted file mode 120000
index 24234ae18e..0000000000
--- a/Base/usr/bin/env
+++ /dev/null
@@ -1 +0,0 @@
-/bin/env
\ No newline at end of file
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index b152c12071..2e3a9100a6 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -134,7 +134,7 @@ chmod 755 mnt/res/devel/templates/*.postcreate
 echo "done"
 
 printf "creating initial filesystem structure... "
-for dir in bin etc proc mnt tmp boot mod var/run usr/local; do
+for dir in bin etc proc mnt tmp boot mod var/run usr/local usr/bin; do
     mkdir -p mnt/$dir
 done
 chmod 700 mnt/boot
@@ -200,6 +200,8 @@ echo "done"
 printf "installing shortcuts... "
 ln -sf Shell mnt/bin/sh
 ln -sf test mnt/bin/[
+ln -sf less mnt/bin/more
+ln -sf /bin/env mnt/usr/bin/env
 echo "done"
 
 printf "installing 'checksum' variants... "