diff --git a/commands/man/man.conf b/commands/man/man.conf
index 6ad868452..855ffa934 100644
--- a/commands/man/man.conf
+++ b/commands/man/man.conf
@@ -3,4 +3,4 @@ _subdir         man[1-9]
 _suffix         .0
 _build          .[1-9]  mandoc %s
 _build          .tbl    tbl %s | mandoc 
-_default        /usr/man /usr/pkg/X11R6/man /usr/pkg/man /usr/pkg/gcc44/man /usr/llvm/share/man
+_default        /usr/man /usr/pkg/X11R6/man /usr/pkg/man /usr/pkg/gcc44/man
diff --git a/etc/ast/.ashrc b/etc/ast/.ashrc
index ab18d091a..135badcf7 100644
--- a/etc/ast/.ashrc
+++ b/etc/ast/.ashrc
@@ -7,7 +7,7 @@ umask 022
 # Favourite editor and pager, search path for binaries, etc.
 export EDITOR=vi
 export PAGER=more
-export PATH=$HOME/bin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin
+export PATH=$HOME/bin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/pkg/X11R6/bin
 
 } # End of no-repeat.
 
diff --git a/etc/rc b/etc/rc
index 91ed6daa2..3b6626280 100755
--- a/etc/rc
+++ b/etc/rc
@@ -6,7 +6,7 @@ exec </dev/null
 
 umask 022
 TERM="${TERM-minix}"
-PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin:/sbin
+PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/sbin
 RC_TZ=/etc/rc.timezone
 export TERM PATH
 
diff --git a/lib/clang_build.sh b/lib/clang_build.sh
index b8447e97d..201708b03 100755
--- a/lib/clang_build.sh
+++ b/lib/clang_build.sh
@@ -3,6 +3,6 @@
 export CC=clang
 export COMPILER_TYPE=gnu
 export MAKEOBJDIR=obj-gnu
-export PATH=$PATH:/usr/pkg/bin:/usr/gnu/bin:/usr/llvm/bin
+export PATH=$PATH:/usr/pkg/bin
 
 make $@
diff --git a/lib/gnu_build.sh b/lib/gnu_build.sh
index be5102faf..108a1760c 100755
--- a/lib/gnu_build.sh
+++ b/lib/gnu_build.sh
@@ -2,6 +2,6 @@
 
 export CC=gcc
 export MAKEOBJDIR=obj-gnu
-export PATH=$PATH:/usr/pkg/bin:/usr/gnu/bin
+export PATH=$PATH:/usr/pkg/bin
 
 make $@