diff --git a/files/zlogin b/files/zlogin
new file mode 100644
--- /dev/null
+++ b/files/zlogin
@@ -0,0 +1,5 @@
+if [ -f /etc/zlogin ]; then
+    source /etc/zlogin
+elif [ -f /etc/zsh/zlogin ]; then
+    source /etc/zsh/zlogin
+fi
\ No newline at end of file
diff --git a/files/zlogout b/files/zlogout
new file mode 100644
--- /dev/null
+++ b/files/zlogout
@@ -0,0 +1,5 @@
+if [ -f /etc/zlogout ]; then
+    source /etc/zlogout
+elif [ -f /etc/zsh/zlogout ]; then
+    source /etc/zsh/zlogout
+fi
\ No newline at end of file
diff --git a/files/zprofile b/files/zprofile
new file mode 100644
--- /dev/null
+++ b/files/zprofile
@@ -0,0 +1,7 @@
+if [ -f /etc/zprofile ]; then
+    source /etc/zprofile
+elif [ -f /etc/zsh/zprofile ]; then
+    source /etc/zsh/zprofile
+else
+    emulate sh -c 'source /etc/profile'
+fi
\ No newline at end of file
diff --git a/files/zshenv b/files/zshenv
new file mode 100644
--- /dev/null
+++ b/files/zshenv
@@ -0,0 +1,5 @@
+if [ -f /etc/zshenv ]; then
+    source /etc/zshenv
+elif [ -f /etc/zsh/zshenv ]; then
+    source /etc/zsh/zshenv
+fi
\ No newline at end of file
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : zsh
 version    : 5.7.1
-release    : 20
+release    : 21
 source     :
     - https://sourceforge.net/projects/zsh/files/zsh/5.7.1/zsh-5.7.1.tar.xz/download : 7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8
 license    : MIT
@@ -17,6 +17,11 @@
                --enable-multibyte \
                --enable-pcre \
                --with-tcsetpgrp \
+               --enable-etcdir=/usr/share/defaults/etc/zsh \
+               --enable-zshenv=/usr/share/defaults/etc/zsh/zshenv \
+               --enable-zlogin=/usr/share/defaults/etc/zsh/zlogin \
+               --enable-zlogout=/usr/share/defaults/etc/zsh/zlogout \
+               --enable-zprofile=/usr/share/defaults/etc/zsh/zprofile \
                --enable-fndir=/usr/share/zsh/functions \
                --enable-scriptdir=/usr/share/zsh/scripts
 build      : |
@@ -24,6 +29,8 @@
 install    : |
     %make_install
     rmdir $installdir/usr/share/zsh/site-functions
+    install -dm00644 $installdir/usr/share/defaults/etc/zsh/
+    cp $pkgfiles/* $installdir/usr/share/defaults/etc/zsh/
 check      : |-
     # Should investigate why this test fails
     rm Test/A05execution.ztst
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -58,6 +58,10 @@
             <Path fileType="library">/usr/lib64/zsh/5.7.1/zsh/zpty.so</Path>
             <Path fileType="library">/usr/lib64/zsh/5.7.1/zsh/zselect.so</Path>
             <Path fileType="library">/usr/lib64/zsh/5.7.1/zsh/zutil.so</Path>
+            <Path fileType="data">/usr/share/defaults/etc/zsh/zlogin</Path>
+            <Path fileType="data">/usr/share/defaults/etc/zsh/zlogout</Path>
+            <Path fileType="data">/usr/share/defaults/etc/zsh/zprofile</Path>
+            <Path fileType="data">/usr/share/defaults/etc/zsh/zshenv</Path>
             <Path fileType="man">/usr/share/man/man1/zsh.1</Path>
             <Path fileType="man">/usr/share/man/man1/zshall.1</Path>
             <Path fileType="man">/usr/share/man/man1/zshbuiltins.1</Path>
@@ -1333,8 +1337,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="20">
-            <Date>2019-05-17</Date>
+        <Update release="21">
+            <Date>2020-03-08</Date>
             <Version>5.7.1</Version>
             <Comment>Packaging update</Comment>
             <Name>F. von Gellhorn</Name>