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/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,8 @@
                --enable-multibyte \
                --enable-pcre \
                --with-tcsetpgrp \
+               --enable-etcdir=/usr/share/defaults/etc/zsh \
+               --enable-zprofile=/usr/share/defaults/etc/zsh/zprofile \
                --enable-fndir=/usr/share/zsh/functions \
                --enable-scriptdir=/usr/share/zsh/scripts
 build      : |
@@ -24,6 +26,7 @@
 install    : |
     %make_install
     rmdir $installdir/usr/share/zsh/site-functions
+    install -Dm00644 $pkgfiles/zprofile $installdir/usr/share/defaults/etc/zsh/zprofile
 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
@@ -2,8 +2,8 @@
     <Source>
         <Name>zsh</Name>
         <Packager>
-            <Name>F. von Gellhorn</Name>
-            <Email>flinux@vongellhorn.ch</Email>
+            <Name>Troy Harvey</Name>
+            <Email>harveydev@protonmail.com</Email>
         </Packager>
         <License>MIT</License>
         <PartOf>system.utils</PartOf>
@@ -58,6 +58,7 @@
             <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/zprofile</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,12 +1334,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="20">
-            <Date>2019-05-17</Date>
+        <Update release="21">
+            <Date>2020-02-23</Date>
             <Version>5.7.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>F. von Gellhorn</Name>
-            <Email>flinux@vongellhorn.ch</Email>
+            <Name>Troy Harvey</Name>
+            <Email>harveydev@protonmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file