diff --git a/pentoo/zero-system/files/zshrc b/pentoo/zero-system/files/zshrc
new file mode 100644
index 000000000..cd5ad6695
--- /dev/null
+++ b/pentoo/zero-system/files/zshrc
@@ -0,0 +1,84 @@
+source /etc/profile
+autoload -U compinit promptinit
+compinit
+promptinit; prompt gentoo
+setopt correctall
+setopt share_history
+setopt histreduceblanks
+setopt INC_APPEND_HISTORY
+setopt NO_HIST_BEEP
+setopt HIST_IGNORE_DUPS
+setopt HIST_IGNORE_ALL_DUPS
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_SAVE_NO_DUPS
+setopt HIST_FIND_NO_DUPS
+# Use the same history file for all sessions
+setopt SHARE_HISTORY
+# Let the user edit the command line after history expansion (e.g. !ls) instead of immediately running it
+setopt hist_verify
+
+setopt extended_glob
+#setopt noequals
+setopt HASH_CMDS
+
+HISTFILE=~/.zsh_history
+HISTSIZE=10000
+SAVEHIST=10000
+
+eval $(dircolors -b /etc/DIR_COLORS)
+
+alias mv='nocorrect mv'
+alias cp='nocorrect cp'
+alias mkdir='nocorrect mkdir'
+alias rm='nocorrect rm'
+
+alias ls="ls --color -F"
+alias ll='ls -l --color -F'
+alias grep='grep --color=always'
+alias locate="noglob locate"
+alias cvsstatus="cvs -qn update"
+alias cvs-status="cvs -qn update"
+
+#bindkey "\e[A" history-beginning-search-backward
+#bindkey "\e[B" history-beginning-search-forward
+#bindkey "\eOA" history-beginning-search-backward
+#bindkey "\eOB" history-beginning-search-forward
+#bindkey "\e[1~" beginning-of-line
+#bindkey "\e[2~" quoted-insert
+bindkey "\e[3~" delete-char
+#bindkey "\e[4~" end-of-line
+#bindkey "\e[5~" beginning-of-history
+#bindkey "\e[6~" end-of-history
+#bindkey "\e[7~" beginning-of-line
+#bindkey "\e[8~" end-of-line
+bindkey "\e[H" beginning-of-line
+bindkey "\e[F" end-of-line
+bindkey "\eOH" beginning-of-line
+bindkey "\eOF" end-of-line
+#bindkey "\eOd" backward-word
+#bindkey "\eOc" forward-word 
+
+if [ "${USER}" != "root" ]; then
+  #eval `keychain --eval ~/.ssh/gentoo_rsa DD11F94A`
+  eval `keychain --eval ~/.ssh/gentoo_rsa`
+  #eval `gpg-agent --daemon --enable-ssh-support`
+fi
+
+setopt prompt_subst
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' actionformats \
+    '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+zstyle ':vcs_info:*' formats       \
+    '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{5}]%f '
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+
+zstyle ':vcs_info:*' enable git cvs svn
+
+# or use pre_cmd, see man zshcontrib
+vcs_info_wrapper() {
+  vcs_info
+  if [ -n "$vcs_info_msg_0_" ]; then
+    echo "%{$fg[grey]%}${vcs_info_msg_0_}%{$reset_color%}$del"
+  fi
+}
+RPROMPT=$'$(vcs_info_wrapper)'
diff --git a/pentoo/zero-system/zero-system-9999.ebuild b/pentoo/zero-system/zero-system-2018.1.ebuild
similarity index 82%
rename from pentoo/zero-system/zero-system-9999.ebuild
rename to pentoo/zero-system/zero-system-2018.1.ebuild
index 69d5a4d82..8acf494ec 100644
--- a/pentoo/zero-system/zero-system-9999.ebuild
+++ b/pentoo/zero-system/zero-system-2018.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="The ZERO (Zoning & Emotional Range Omitted) System is a technology for interfacing the brain of the pilot with the mobile suit's computer."
 HOMEPAGE="http://www.pentoo.ch/"
@@ -12,6 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 IUSE="nu"
+S="${WORKDIR}"
 
 PDEPEND="
 		app-eselect/eselect-sh
@@ -72,3 +73,21 @@ PDEPEND="
 			media-sound/asunder
 			)
 "
+
+src_install() {
+	if [ -d /home/zero ]; then
+		insinto /home/zero
+		newins "${FILESDIR}"/zshrc .zshrc
+	fi
+	insinto /root
+	newins "${FILESDIR}"/zshrc .zshrc
+	insinto /etc/skel
+	newins "${FILESDIR}"/zshrc .zshrc
+}
+
+pkg_postinst() {
+	chsh -s /bin/zsh
+	if grep -q zero /etc/passwd && [ "$(grep zero /etc/passwd | awk -F: '{print $7}')" != "/bin/zsh" ]; then
+		chsh -s /bin/zsh zero
+	fi
+}