diff -Nru openafs-1.6.21/debian/changelog openafs-1.6.21/debian/changelog
--- openafs-1.6.21/debian/changelog	2017-08-22 18:47:50.000000000 -0500
+++ openafs-1.6.21/debian/changelog	2017-08-23 09:57:51.000000000 -0500
@@ -1,3 +1,10 @@
+openafs (1.6.21-2ubuntu1) artful; urgency=medium
+
+  * debian/patches:
+    - Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch (LP: #1711835)
+
+ -- Seth Forshee <seth.forshee@canonical.com>  Wed, 23 Aug 2017 09:57:51 -0500
+
 openafs (1.6.21-2) unstable; urgency=medium
 
   * debian/patches:
diff -Nru openafs-1.6.21/debian/control openafs-1.6.21/debian/control
--- openafs-1.6.21/debian/control	2017-08-22 17:49:27.000000000 -0500
+++ openafs-1.6.21/debian/control	2017-08-23 09:57:51.000000000 -0500
@@ -1,7 +1,8 @@
 Source: openafs
 Section: net
 Priority: optional
-Maintainer: Benjamin Kaduk <kaduk@mit.edu>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Benjamin Kaduk <kaduk@mit.edu>
 Uploaders: Russ Allbery <rra@debian.org>, Sam Hartman <hartmans@debian.org>,
  Anders Kaseorg <andersk@mit.edu>
 Build-Depends: debhelper (>= 9.20160114~), autoconf, automake, bison, comerr-dev,
diff -Nru openafs-1.6.21/debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch openafs-1.6.21/debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch
--- openafs-1.6.21/debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch	1969-12-31 18:00:00.000000000 -0600
+++ openafs-1.6.21/debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch	2017-08-23 09:57:49.000000000 -0500
@@ -0,0 +1,67 @@
+From 67b570453d8824025d8e1b7026e7cdeb474c54de Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Tue, 22 Aug 2017 07:59:11 -0500
+Subject: [PATCH] Linux: Include linux/uaccess.h rather than asm/uaccess.h
+
+Starting with 4.12 there is a module build error on s390 due to
+the arch-specific uaccess.h using a macro defined in the generic
+include. The generic include has been around since 2.6.18 and has
+always included asm/uaccess.h, so switch to using the generic
+include for all kernels which have it.
+
+Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
+---
+ src/afs/LINUX/osi_machdep.h | 4 ++++
+ src/afs/sysincludes.h       | 6 +++++-
+ src/rx/LINUX/rx_knet.c      | 4 ++++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+
+Index: openafs-1.6.21/src/afs/LINUX/osi_machdep.h
+===================================================================
+--- openafs-1.6.21.orig/src/afs/LINUX/osi_machdep.h
++++ openafs-1.6.21/src/afs/LINUX/osi_machdep.h
+@@ -123,7 +123,11 @@ wakeup(void *event)
+ #define IsAfsVnode(V) ((V)->i_sb == afs_globalVFS)	/* test superblock instead */
+ #define SetAfsVnode(V)					/* unnecessary */
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+ #include <asm/uaccess.h>
++#else
++#include <linux/uaccess.h>
++#endif
+ 
+ #define copyin(F, T, C)  (copy_from_user ((char*)(T), (char*)(F), (C)) > 0 ? EFAULT : 0)
+ static inline long copyinstr(char *from, char *to, int count, int *length) {
+Index: openafs-1.6.21/src/afs/sysincludes.h
+===================================================================
+--- openafs-1.6.21.orig/src/afs/sysincludes.h
++++ openafs-1.6.21/src/afs/sysincludes.h
+@@ -151,7 +151,11 @@ struct coda_inode_info {
+ struct xfs_inode_info {
+ };
+ # endif
+-# include <asm/uaccess.h>
++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
++#  include <asm/uaccess.h>
++# else
++#  include <linux/uaccess.h>
++# endif
+ # include <linux/list.h>
+ # include <linux/dcache.h>
+ # include <linux/mount.h>
+Index: openafs-1.6.21/src/rx/LINUX/rx_knet.c
+===================================================================
+--- openafs-1.6.21.orig/src/rx/LINUX/rx_knet.c
++++ openafs-1.6.21/src/rx/LINUX/rx_knet.c
+@@ -18,7 +18,11 @@
+ 
+ #include <linux/version.h>
+ #include "rx/rx_kcommon.h"
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+ #include <asm/uaccess.h>
++#else
++#include <linux/uaccess.h>
++#endif
+ #ifdef ADAPT_PMTU
+ #include <linux/errqueue.h>
+ #include <linux/icmp.h>
diff -Nru openafs-1.6.21/debian/patches/series openafs-1.6.21/debian/patches/series
--- openafs-1.6.21/debian/patches/series	2017-08-22 16:46:28.000000000 -0500
+++ openafs-1.6.21/debian/patches/series	2017-08-23 09:56:39.000000000 -0500
@@ -1,3 +1,4 @@
 0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch
 AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch
 Linux-4.13-use-designated-initializers-where-require.patch
+Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch