diff --git a/zsh/PKGBUILD b/zsh/PKGBUILD
index 22774558..95096d68 100644
--- a/zsh/PKGBUILD
+++ b/zsh/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgbase=zsh
 pkgname=('zsh' 'zsh-doc')
-pkgver=5.0.7
-pkgrel=4
+pkgver=5.1.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
 license=('custom')
 makedepends=('ncurses-devel' 'pcre-devel' 'libiconv-devel' 'libgdbm-devel')
-source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2"
-        "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2"
+source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.gz"
+        "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.gz"
         'config.guess::http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
         'config.sub::http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
         'zprofile'
@@ -18,14 +18,14 @@ source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2"
         msysize.patch
         zsh-5.0.6-1.patch
         msys-symlink-hack.patch)
-md5sums=('1cd396ce17952de50b8a89980d617f0a'
-         'ec04d46211a20281778ddbbde9aa680f'
-         'SKIP'
-         'SKIP'
+md5sums=('8ba28a9ef82e40c3a271602f18343b2f'
+         '6f961a67b21f15cfbd735639af25cab5'
+         '08478727a5b38779bc62b632166b9f7f'
+         'b4b24b88055910a6b4dbb0f436af648e'
          '24a9335edf77252a7b5f52e079f7aef7'
          'ca9d481e1aa03e864734734d2267afb0'
-         'df6860fd5b5b46d59ad03220e9125c9d'
-         '72860740c3722a27daaea164db0e478e'
+         '51a8f2979ce99db238bc38c2f477df74'
+         'edcafce2abb584422877327a9ca7b9de'
          '2b3f986cccd301534909b399557973a5'
          '79419542f6c2c33cb1a1e209fcd7e98c')
 
diff --git a/zsh/add-pwd-W-option.patch b/zsh/add-pwd-W-option.patch
index 4281c01e..ad575d04 100644
--- a/zsh/add-pwd-W-option.patch
+++ b/zsh/add-pwd-W-option.patch
@@ -7,9 +7,9 @@ diff -rupN zsh-5.0.6/Src/builtin.c zsh-5.0.6-patch/Src/builtin.c
      BUILTIN("pushln", 0, bin_print, 0, -1, BIN_PRINT, NULL, "-nz"),
 -    BUILTIN("pwd", 0, bin_pwd, 0, 0, 0, "rLP", NULL),
 +    BUILTIN("pwd", 0, bin_pwd, 0, 0, 0, "rLPW", NULL),
-     BUILTIN("r", 0, bin_fc, 0, -1, BIN_R, "nrl", NULL),
+     BUILTIN("r", 0, bin_fc, 0, -1, BIN_R, "IlLnr", NULL),
      BUILTIN("read", 0, bin_read, 0, -1, 0, "cd:ek:%lnpqrst:%zu:AE", NULL),
-     BUILTIN("readonly", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL, bin_typeset, 0, -1, 0, "AE:%F:%HL:%R:%TUZ:%afghi:%lptux", "r"),
+     BUILTIN("readonly", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL | BINF_ASSIGN, (HandlerFunc)bin_typeset, 0, -1, 0, "AE:%F:%HL:%R:%TUZ:%afghi:%lptux", "r"),
 @@ -672,7 +672,21 @@ int doprintdir = 0;		/* set in exec.c (f
  int
  bin_pwd(UNUSED(char *name), UNUSED(char **argv), Options ops, UNUSED(int func))
diff --git a/zsh/msysize.patch b/zsh/msysize.patch
index 69df1c36..7c5a00c7 100644
--- a/zsh/msysize.patch
+++ b/zsh/msysize.patch
@@ -112,10 +112,10 @@ diff -Naur zsh-5.0.7-orig/Src/mkmakemod.sh zsh-5.0.7/Src/mkmakemod.sh
  			;;
  			* )
  			    mdll="\$(dir_top)/$loc/${depbase}.\$(DL_EXT) "
-diff -Naur zsh-5.0.7-orig/Test/C02cond.ztst zsh-5.0.7/Test/C02cond.ztst
---- zsh-5.0.7-orig/Test/C02cond.ztst	2014-05-16 22:21:25.000000000 +0300
-+++ zsh-5.0.7/Test/C02cond.ztst	2014-11-04 18:45:27.454400000 +0300
-@@ -94,7 +94,7 @@
+diff -Naur zsh-5.1.1-orig/Test/C02cond.ztst zsh-5.1.1/Test/C02cond.ztst
+--- zsh-5.1.1-orig/Test/C02cond.ztst	2014-05-16 22:21:25.000000000 +0300
++++ zsh-5.1.1/Test/C02cond.ztst	2014-11-04 18:45:27.454400000 +0300
+@@ -111,7 +111,7 @@
    if (( EUID == 0 )); then
      print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]] (root reads anything)'
      [[ -r zerolength && -r unmodish ]]
@@ -124,12 +124,12 @@ diff -Naur zsh-5.0.7-orig/Test/C02cond.ztst zsh-5.0.7/Test/C02cond.ztst
      print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]]
     (all files created by user may be readable)'
     [[ -r zerolength ]]
-@@ -133,7 +133,7 @@
+@@ -150,7 +150,7 @@
    sleep 2
-   cat unmodified
-   touch newnewnew
+   cat $unmodified
+   touch $newnewnew
 -  if [[ $OSTYPE == "cygwin" ]]; then
 +  if [[ $OSTYPE == "cygwin" || $OSTYPE = msys ]]; then
-     print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)"
-     true
-   elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then
+     ZTST_skip="[[ -N file ]] not supported on Cygwin"
+   elif (( isnfs )); then
+     ZTST_skip="[[ -N file ]] not supported with NFS"