diff --git a/mono-core.changes b/mono-core.changes
index 32a1449..c89ee65 100644
--- a/mono-core.changes
+++ b/mono-core.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  7 10:21:45 UTC 2017 - schwab@suse.de
+
+- ucontext.patch: use ucontext_t instead of struct ucontext
+
 -------------------------------------------------------------------
 Fri May 26 21:00:00 UTC 2017 - fwdsbs.to.11df@xoxy.net
 
diff --git a/mono-core.spec b/mono-core.spec
index 2179c2c..e4193d4 100644
--- a/mono-core.spec
+++ b/mono-core.spec
@@ -52,6 +52,8 @@ Source1:        mono-core.rpmlintrc
 Source2:        gmcs
 # ppc build segfault so exclude it
 ExcludeArch:    ppc
+# PATCH-FIX-UPSTREAM use ucontext_t instead of struct ucontext
+Patch1:         ucontext.patch
 # PATCH-FIX-OPENSUSE remove checks for libmono in mono-find-provides and mono-find-requires scripts
 Patch14:        find-deps-fix.patch
 # PATCH-FIX-OPENSUSE revert Microsoft.Build.Tasks library to use old mcs compiler. This will make xbuild to use old mcs instead of csc - patch is used when roslyn is unavailable for current platform (big-endian systems).
@@ -192,6 +194,7 @@ technologies that have been submitted to the ECMA for standardization.
 
 %prep
 %setup -q -n mono-%{version}.%{version_suffix}
+%patch1 -p1
 %patch14 -p1
 %if %roslyn == no
 %patch15 -p1
diff --git a/ucontext.patch b/ucontext.patch
new file mode 100644
index 0000000..e67b12b
--- /dev/null
+++ b/ucontext.patch
@@ -0,0 +1,26 @@
+Index: mono-5.0.1.1/mono/utils/mono-context.h
+===================================================================
+--- mono-5.0.1.1.orig/mono/utils/mono-context.h
++++ mono-5.0.1.1/mono/utils/mono-context.h
+@@ -907,7 +907,7 @@ typedef struct {
+ 
+ #define MONO_ARCH_HAS_MONO_CONTEXT 1
+ 
+-typedef struct ucontext MonoContext;
++typedef ucontext_t MonoContext;
+ 
+ #define MONO_CONTEXT_SET_IP(ctx,ip) 					\
+ 	do {								\
+Index: mono-5.0.1.1/mono/utils/mono-sigcontext.h
+===================================================================
+--- mono-5.0.1.1.orig/mono/utils/mono-sigcontext.h
++++ mono-5.0.1.1/mono/utils/mono-sigcontext.h
+@@ -285,7 +285,7 @@ typedef struct ucontext {
+ #endif
+ 
+ #if defined(__linux__)
+-	typedef struct ucontext os_ucontext;
++	typedef ucontext_t os_ucontext;
+ 
+ #ifdef __mono_ppc64__
+ 	#define UCONTEXT_REG_Rn(ctx, n)   (((os_ucontext*)(ctx))->uc_mcontext.gp_regs [(n)])