diff --git a/glibc-2.3.90-langpackdir.diff b/glibc-2.3.90-langpackdir.diff
index aa7e45e..6b9c4e7 100644
--- a/glibc-2.3.90-langpackdir.diff
+++ b/glibc-2.3.90-langpackdir.diff
@@ -2,7 +2,7 @@ Index: glibc-2.27/intl/loadmsgcat.c
 ===================================================================
 --- glibc-2.27.orig/intl/loadmsgcat.c
 +++ glibc-2.27/intl/loadmsgcat.c
-@@ -796,8 +796,47 @@ _nl_load_domain (struct loaded_l10nfile
+@@ -796,8 +796,27 @@ _nl_load_domain (struct loaded_l10nfile
    if (domain_file->filename == NULL)
      goto out;
  
@@ -28,26 +28,6 @@ Index: glibc-2.27/intl/loadmsgcat.c
 +  if (fd == -1)
 +    /* Try to open the addressed file.  */
 +    fd = open (domain_file->filename, O_RDONLY | O_BINARY);
-+
-+  if (fd == -1)
-+    {
-+      /* Use the fallback directory.  */
-+      const char *bundle_dir = "/usr/share/locale-bundle/";
-+      char *filename_bundle = malloc (strlen (domain_file->filename) +
-+				      strlen (bundle_dir));
-+      if (filename_bundle != NULL)
-+	{
-+	  char *p = strstr (domain_file->filename, "/locale/");
-+	  if (p != NULL)
-+	    {
-+	      strcpy (filename_bundle, bundle_dir);
-+	      strcpy (&filename_bundle[strlen (bundle_dir)], p + 8);
-+	      fd = open (filename_bundle, O_RDONLY | O_BINARY);
-+	    }
-+
-+	  free (filename_bundle);
-+	}
-+    }
 +
    if (fd == -1)
      goto out;
diff --git a/glibc.changes b/glibc.changes
index e26d1a2..57880c1 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jun 19 08:37:43 UTC 2018 - schwab@suse.de
+
+- Use python3-pexpect instead of python-pexpect
+
+-------------------------------------------------------------------
+Thu Jun 14 12:29:54 UTC 2018 - schwab@suse.de
+
+- riscv-kernel-sigaction.patch: fix struct kernel_sigaction to match the
+  kernel version (BZ #23069)
+
+-------------------------------------------------------------------
+Mon Jun  4 08:18:44 UTC 2018 - schwab@suse.de
+
+- glibc-2.3.90-langpackdir.diff: No longer search in /usr/share/locale-bundle
+
 -------------------------------------------------------------------
 Wed May 23 08:18:00 UTC 2018 - schwab@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 6e210aa..d448ec2 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -72,7 +72,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gdb
 BuildRequires:  glibc-devel-static
 BuildRequires:  libstdc++-devel
-BuildRequires:  python-pexpect
+BuildRequires:  python3-pexpect
 %endif
 %if %{build_utils}
 BuildRequires:  gd-devel
@@ -308,6 +308,8 @@ Patch1011:      i386-memmove-sse2-unaligned.patch
 Patch1012:      mempcpy-avx512.patch
 # PATCH-FIX-UPSTREAM realpath-ssize-max-overflow.patch: Fix overflow in path length computation (CVE-2018-11236, BZ #22786)
 Patch1013:      realpath-ssize-max-overflow.patch
+# PATCH-FIX-UPSTREAM RISC-V: fix struct kernel_sigaction to match the kernel version (BZ #23069)
+Patch1014:      riscv-kernel-sigaction.patch
 
 ### 
 # Patches awaiting upstream approval
@@ -531,6 +533,7 @@ mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
+%patch1014 -p1
 
 %patch2000 -p1
 %patch2004 -p1
diff --git a/riscv-kernel-sigaction.patch b/riscv-kernel-sigaction.patch
new file mode 100644
index 0000000..aedf329
--- /dev/null
+++ b/riscv-kernel-sigaction.patch
@@ -0,0 +1,17 @@
+2018-04-28  Aurelien Jarno  <aurelien@aurel32.net>
+
+	[BZ #23069]
+	* sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h: New file.
+
+Index: glibc-2.27/sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h
+===================================================================
+--- /dev/null
++++ glibc-2.27/sysdeps/unix/sysv/linux/riscv/kernel_sigaction.h
+@@ -0,0 +1,7 @@
++/* This is the sigaction structure from the RISC-V Linux 4.15 kernel.  */
++
++struct kernel_sigaction {
++	__sighandler_t k_sa_handler;
++	unsigned long sa_flags;
++	sigset_t sa_mask;
++};