diff --git a/srcpkgs/base-files/files/dot_bash_profile b/srcpkgs/base-files/files/dot_bash_profile
index eca076703ea..91686f17058 100644
--- a/srcpkgs/base-files/files/dot_bash_profile
+++ b/srcpkgs/base-files/files/dot_bash_profile
@@ -6,8 +6,6 @@ if [ -f ~/.bashrc ]; then
 fi
 
 # User specific environment and startup programs
-
-PATH=$PATH:$HOME/bin
-PS1="[\u@\h \W]$ "
-
-export PATH PS1
+if [ -f ~/.profile ]; then
+	. ~/.profile
+fi
diff --git a/srcpkgs/base-files/files/dot_profile b/srcpkgs/base-files/files/dot_profile
index 0d7623b5087..8754ea01e61 100644
--- a/srcpkgs/base-files/files/dot_profile
+++ b/srcpkgs/base-files/files/dot_profile
@@ -3,3 +3,8 @@
 if [ -f /etc/profile ]; then
 	. /etc/profile
 fi
+
+PATH=$PATH:$HOME/bin
+PS1="[\u@\h \W]$ "
+
+export PATH PS1
diff --git a/srcpkgs/base-files/files/which2.sh b/srcpkgs/base-files/files/which2.sh
deleted file mode 100644
index 14ca09f4ea8..00000000000
--- a/srcpkgs/base-files/files/which2.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Initialization script for bash and sh
-
-# export AFS if you are in AFS environment
-alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 5835879b813..691e8448f7c 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.58
+version=0.59
 short_desc="Void GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"