diff --git a/ChangeLog b/ChangeLog
index 50d19e79c4..0484809261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-28  Zack Weinberg  <zackw@panix.com>
+
+	* sysdeps/unix/sysv/linux/s390/sys/ucontext.h: Restore accidentally-
+	deleted typedef ucontext_t.
+
 2016-09-26  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysdep.h (__INTERNAL_SYSCALL0): New macro.
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
index 0128d1fa55..35d30685d1 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
@@ -74,14 +74,14 @@ typedef struct
   } mcontext_t;
 
 /* Userlevel context.  */
-struct ucontext
+typedef struct ucontext
   {
     unsigned long int uc_flags;
     struct ucontext *uc_link;
     stack_t uc_stack;
     mcontext_t uc_mcontext;
     __sigset_t uc_sigmask;
-  };
+  } ucontext_t;
 
 
 #endif /* sys/ucontext.h */