diff --git a/config/csh.login b/config/csh.login
index d39ade4..f8f352c 100644
--- a/config/csh.login
+++ b/config/csh.login
@@ -4,9 +4,9 @@
 
 
 if ($?PATH) then
-	setenv PATH "${PATH}:/usr/X11R6/bin"
+	setenv PATH "${PATH}"
 else
-	setenv PATH "/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
+	setenv PATH "/usr/bin:/usr/local/bin"
 endif
 
 # (pixel) tcsh doesn't handle directory in the PATH being non-readable
@@ -25,7 +25,7 @@ else
 	umask 002
 endif
 
-setenv HOSTNAME `/bin/hostname`
+setenv HOSTNAME `/usr/bin/hostname`
 set history=1000
 
 if ( -f $HOME/.inputrc ) then
diff --git a/config/profile b/config/profile
index fd01cb7..499d35c 100644
--- a/config/profile
+++ b/config/profile
@@ -1,6 +1,6 @@
 # profile     Default shell profile configuration
 #
-# Copyright (c) 2003-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2003-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (c) 2003-2008 by Davide Madrisan <davide.madrisan@gmail.com>
 #
 # WARNING:
@@ -21,22 +21,10 @@ fi
 loginsh=1
 
 # Make path more comfortable
-PATH=/bin:/usr/bin:/usr/local/bin
+PATH=/usr/bin:/usr/local/bin
 if [ "$UID" = 0 ]; then
-   [ -d /opt/gnome/sbin ] && PATH=$PATH:/opt/gnome/sbin
-   [ -d /opt/kde/sbin ] && PATH=$PATH:/opt/kde/sbin
-   [ -d /opt/kde3/sbin ] && PATH=$PATH:/opt/kde3/sbin
-   PATH=/sbin:/usr/sbin:/usr/local/sbin:$PATH
+   PATH=/usr/sbin:/usr/local/sbin:$PATH
 fi
-for dir in /opt/bin \
-           /opt/gnome/bin \
-           /opt/kde/bin \
-           /opt/kde3/bin \
-           /usr/lib/qt3/bin
-do
-   [ -d "$dir" ] && PATH=$PATH:$dir
-done
-unset dir
 export PATH
 
 umask 022
@@ -45,7 +33,7 @@ USER=`id -un`
 LOGNAME=$USER
 MAIL="/var/spool/mail/$USER"
 HISTCONTROL=ignoredups
-HOSTNAME=`/bin/hostname`
+HOSTNAME=`/usr/bin/hostname`
 HISTSIZE=1000
 export USER LOGNAME MAIL HISTCONTROL HOSTNAME HISTSIZE