diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 1d6b1ca58e2..293bf59ec5d 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -82,6 +82,12 @@
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  ipl10 = {
+    shortName = "IPL 1.0";
+    fullName = "IBM Public License Version 1.0";
+    url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html;
+  };
+
   ijg = {
     shortName = "IJG";
     fullName = "Independent JPEG Group License";
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 330bcc2e863..ba7de83d939 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,63 +1,47 @@
-{ stdenv, fetchurl, autoconf, automake, flex, yacc,
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
   kernel, glibc, ncurses, perl, krb5 }:
 
 assert stdenv.isLinux;
 
-let
-  pname = "openafs";
-  version = "1.4.11";
-  name = "${pname}-${version}-${kernel.version}";
-  webpage = http://www.openafs.org;
-in
-
-stdenv.mkDerivation rec {
-  inherit name;
+stdenv.mkDerivation {
+  name = "openafs-1.6.0-${kernel.version}";
 
   src = fetchurl {
-    url = "${webpage}/dl/${pname}/${version}/${pname}-${version}-src.tar.gz";
-    sha256 = "ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9";
+    url = http://www.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2;
+    sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7";
   };
 
-  buildInputs = [ autoconf automake flex yacc ncurses perl ];
+  buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
-  replace_usrbinenv = ./replace-usrbinenv;
-  replace_usrinclude = ./replace-usrinclude;
-  replace_usrbinperl = ./replace-usrbinperl;
-  replace_usrsrc = ./replace-usrsrc;
-
-  configurePhase = ''
+  preConfigure = ''
     ln -s ${kernel}/lib/modules/*/build $TMP/linux
 
-    echo "Replace ..."
-    for i in `cat ${replace_usrbinenv}`; do
-      substituteInPlace $i --replace "/usr/bin/env" $(type -tp env)
+    patchShebangs .
+    for i in `grep -l -R '/usr/\(include\|src\)' .`; do
+      echo "Patch /usr/include and /usr/src in $i"
+      substituteInPlace $i \
+        --replace "/usr/include" "${glibc}/include" \
+        --replace "/usr/src" "$TMP"
     done
-    for i in `cat ${replace_usrinclude}`; do
-      substituteInPlace $i --replace "/usr/include" "${glibc}/include"
-    done
-    for i in `cat ${replace_usrbinperl}`; do
-      substituteInPlace $i --replace "/usr/bin/perl" $(type -tp perl)
-    done
-    for i in `cat ${replace_usrsrc}`; do
-      substituteInPlace $i --replace "/usr/src" "$TMP"
-    done
-    echo "... done"
 
     ./regen.sh
 
-    ./configure \
-       --prefix=$out \
-       --with-linux-kernel-build=$TMP/linux \
-       --with-krb5-conf=${krb5}/bin/krb5-config \
-       --sysconfdir=/etc/static
-       #--with-afs-sysname=amd64_linux26 \
+    export KRB5_CONFIG=${krb5}/bin/krb5-config
 
-    substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp)
+    configureFlagsArray=(
+      "--with-linux-kernel-build=$TMP/linux"
+      "--with-krb5"
+      "--sysconfdir=/etc/static"
+    )
   '';
 
   meta = {
-      description = "Open AFS client for Linux";
-      homepage = webpage;
-      license = "IPL";
+    description = "Open AFS client";
+    homepage = http://www.openafs.org;
+    license = stdenv.lib.licenses.ipl10;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [
+      z77z
+    ];
   };
 }
diff --git a/pkgs/servers/openafs-client/replace-usrbinenv b/pkgs/servers/openafs-client/replace-usrbinenv
deleted file mode 100644
index b014e899272..00000000000
--- a/pkgs/servers/openafs-client/replace-usrbinenv
+++ /dev/null
@@ -1,72 +0,0 @@
-src/tests/ptsmembersuser.pl
-src/tests/bossalvagevolume.pl
-src/tests/bosstop.pl
-src/tests/baduniq.pl
-src/tests/voslistvol.pl
-src/tests/aclremoveuser.pl
-src/tests/vosbackup.pl
-src/tests/bosaddhost.pl
-src/tests/vosremove.pl
-src/tests/bosexec.pl
-src/tests/boscreate.pl
-src/tests/bosremovehost.pl
-src/tests/reauth.pl
-src/tests/ptsexamineuser.pl
-src/tests/ptsmembersgroup.pl
-src/tests/bosremovekey.pl
-src/tests/voslistvldb.pl
-src/tests/bosshutdown.pl
-src/tests/bosadduser.pl
-src/tests/aclclearnegrights.pl
-src/tests/boslisthosts.pl
-src/tests/ptslistmax.pl
-src/tests/vosrestore.pl
-src/tests/acladdrights.pl
-src/tests/ptslistown.pl
-src/tests/bosstart.pl
-src/tests/vospartinfo.pl
-src/tests/bosrestartstopped.pl
-src/tests/voszap.pl
-src/tests/vosexamine.pl
-src/tests/acladdnegrights.pl
-src/tests/ptsdeletegroup.pl
-src/tests/bosdelete.pl
-src/tests/bosstatus.pl
-src/tests/aclcopy.pl
-src/tests/ptscreateuser.pl
-src/tests/vosrelease.pl
-src/tests/bosremoveuser.pl
-src/tests/ptsexaminegroup.pl
-src/tests/voslock.pl
-src/tests/vossyncserv.pl
-src/tests/ptsadduser.pl
-src/tests/bossalvagepart.pl
-src/tests/ptsdeleteuser.pl
-src/tests/voslistpart.pl
-src/tests/vosunlock.pl
-src/tests/boslistkeys.pl
-src/tests/voscreate.pl
-src/tests/vosunlockall.pl
-src/tests/vosdump.pl
-src/tests/vosaddsite.pl
-src/tests/acladdgroup.pl
-src/tests/acladduser.pl
-src/tests/afs-newcell.pl
-src/tests/bosaddkey.pl
-src/tests/ptsremove.pl
-src/tests/aclremovegroup.pl
-src/tests/vosremsite.pl
-src/tests/ptschown.pl
-src/tests/ptssetf.pl
-src/tests/afs-rmcell.pl
-src/tests/bosinstall.pl
-src/tests/boslistusers.pl
-src/tests/vossyncvldb.pl
-src/tests/vosdelentry.pl
-src/tests/vosmove.pl
-src/tests/run-suite.pl
-src/tests/vosrename.pl
-src/tests/ptscreategroup.pl
-src/tests/bosdeleterunning.pl
-src/tests/ptssetmax.pl
-src/tests/bossalvageserver.pl
diff --git a/pkgs/servers/openafs-client/replace-usrbinperl b/pkgs/servers/openafs-client/replace-usrbinperl
deleted file mode 100644
index d0742adf06b..00000000000
--- a/pkgs/servers/openafs-client/replace-usrbinperl
+++ /dev/null
@@ -1,16 +0,0 @@
-src/libafs/make_kbuild_makefile.pl
-src/mkdest.pl
-src/tools/install/write_fstab.pl
-src/tools/install/write_pam.pl
-src/tools/install/check_udebug.pl
-src/config/make_libafs_tree.pl
-src/config/make_vnode.pl
-src/packaging/Debian/afs-newcell
-src/packaging/Debian/afs-rootvol
-src/packaging/Debian/kernel-version
-src/packaging/MacOS/csrvdbmerge.pl
-src/packaging/MacOS/decode-panic
-src/packaging/MacOS/Uninstall
-src/packaging/RedHat/mockbuild.pl
-src/packaging/RedHat/openafs-buildfedora.pl
-src/packaging/RedHat/makesrpm.pl
diff --git a/pkgs/servers/openafs-client/replace-usrinclude b/pkgs/servers/openafs-client/replace-usrinclude
deleted file mode 100644
index 65cd5394912..00000000000
--- a/pkgs/servers/openafs-client/replace-usrinclude
+++ /dev/null
@@ -1,42 +0,0 @@
-acinclude.m4
-config.guess
-configure
-configure-libafs
-src/libafs/MakefileProto.NBSD.in
-src/libafs/MakefileProto.HPUX.in
-src/libafs/MakefileProto.FBSD.in
-src/libafs/MakefileProto.OBSD.in
-src/libafs/MakefileProto.DFBSD.in
-src/libafs/MakefileProto.AIX.in
-src/libafs/MakefileProto.DARWIN.in
-src/libafs/MakefileProto.SOLARIS.in
-src/libafs/Makefile.common.in
-src/libafs/MakefileProto.IRIX.in
-src/WINNT/kfw/inc/krb4/conf.h
-src/JAVA/libjafs/Makefile.in
-src/splint.cfg
-src/util/vice.h
-src/cf/osconf.m4
-src/vfsck/dir.c
-src/vfsck/main.c
-src/vfsck/utilities.c
-src/vfsck/vprintf.c
-src/vfsck/pass2.c
-src/vfsck/inode.c
-src/afsweb/apache_includes/1.2/buff.h
-src/afsweb/apache_includes/1.2/conf.h
-src/afsweb/apache_includes/1.3.1/buff.h
-src/afsweb/apache_includes/1.3.1/ap_config.h
-src/afsweb/apache_includes/buff.h
-src/afsweb/apache_includes/1.3.6/buff.h
-src/afsweb/apache_includes/1.3.6/ap_config.h
-src/afsweb/apache_includes/conf.h
-src/des/conf.h
-src/tests/OpenAFS/errtrans.pm
-src/wsadmin.lib/rt_r4.generic
-src/wsadmin.lib/pmax_31.generic
-src/wsadmin.lib/rt_r4.generic.dkload
-src/libuafs/Makefile.common.in
-src/afs/afs.h
-src/afs/IRIX/osi_vfs.h
-src/lwp/process.s
diff --git a/pkgs/servers/openafs-client/replace-usrsrc b/pkgs/servers/openafs-client/replace-usrsrc
deleted file mode 100644
index 42f2c270952..00000000000
--- a/pkgs/servers/openafs-client/replace-usrsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-acinclude.m4
-configure
-configure-libafs
-src/libafs/MakefileProto.NBSD.in
-src/tools/install/make_rpm_source
-src/tools/install/openafs-tools-cmd-1.2.5-1.spec
-src/tools/install/openafs-tools-cmd-1.2.2-1.spec
-src/config/make_vnode.pl
-src/config/linux-version
-src/wsadmin.lib/pmax_31.generic
-src/afs/OBSD/osi_vfsops.c