diff --git a/.zshrc b/.zshrc
index d0b10206..62bef10a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -53,7 +53,14 @@ plugins=(gitfast)
 
 # User configuration
 
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/android-ndk:/opt/android-sdk/tools:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/hanez/bin:/opt/android-ndk/:/opt/android-sdk//platform-tools:/opt/android-sdk//tools:/home/hanez/.gem/ruby/2.2.0/bin"
+# Extend my $PATH to $PATH/bin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH:$HOME/bin
+
+# History settings
+HISTSIZE=100000
+SAVEHIST=100000
+HISTFILE=~/.zsh_history
+
 # export MANPATH="/usr/local/man:$MANPATH"
 
 source $ZSH/oh-my-zsh.sh
@@ -83,20 +90,12 @@ source $ZSH/oh-my-zsh.sh
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# Extend my $PATH to $PATH/bin
-export PATH=$PATH:$HOME/bin
-
 # Now source some stuff that should not be public
 if [ -e ~/.zshprivate ]
 then
 source ~/.zshprivate
 fi
 
-# History settings
-HISTSIZE=100000
-SAVEHIST=100000
-HISTFILE=~/.zsh_history
-
 # Some aliases
 alias ..='cd ..'
 alias ...='cd ../..'