diff --git a/glibc.spec b/glibc.spec
index d80a961..daab049 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-362-g231a59c
+%define glibcsrcdir  glibc-2.25-378-gcfa9bb6
 %define glibcversion 2.25.90
-%define glibcrelease 4%{?dist}
+%define glibcrelease 5%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2275,10 +2275,17 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed May 31 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-5
+- Auto-sync with upstream master,
+  commit cfa9bb61cd09c40def96f042a3123ec0093c4ad0.
+- Fix sys/ucontext.h namespace from signal.h etc. inclusion (swbz#21457)
+- Fix sigstack namespace (swbz#21511)
+
 * Wed May 31 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-4
 - Disable the NULL buffer test in login/tst-ptsname.c. It leads to a build
   failure during 'make check'. A permanent solution is being discussed
   upstream.
+
 * Tue May 23 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-3
 - Auto-sync with upstream master,
   commit 231a59ce2c5719d2d77752c21092960e28837b4a.
diff --git a/sources b/sources
index a974c5c..234d04a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-362-g231a59c.tar.gz) = 79af83ccc469e4e10ab797200eb63829db38eab7cf36c00cee5c4e052540214c43e95af11f7ae5a9371d49e4beea8251357fa698e84dbee462e2347026cfef04
+SHA512 (glibc-2.25-378-gcfa9bb6.tar.gz) = e9f602a31e4f62b48ec2f947a8cca0709291b4d9e0fbbcc9e974ad0a004280e554ab42be3949343ac65b29a5ea845e42deaac8b83aedc678c80ac4e3bb7bbcd9