diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes
index 2b1b213..e5ce448 100644
--- a/apache2-mod_perl.changes
+++ b/apache2-mod_perl.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec 30 13:50:32 UTC 2016 - astieger@suse.com
+
+- update to 2.0.10:
+  * Automatically select the appropriate c89 option when modperl is
+    being built with either gcc 5 or clang
+  * Fix non-threaded Perl 5.22.x build and tests
+  * Add support for Perl 5.22.x
+    drop upstreamed mod_perl-add_support_for_perl_5.22.patch
+
 -------------------------------------------------------------------
 Mon Oct  3 11:15:45 UTC 2016 - tchvatal@suse.com
 
diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec
index 5988ac5..b6df089 100644
--- a/apache2-mod_perl.spec
+++ b/apache2-mod_perl.spec
@@ -18,7 +18,7 @@
 
 %define srcname mod_perl
 Name:           apache2-mod_perl
-Version:        2.0.9
+Version:        2.0.10
 Release:        0
 Summary:        Embedded Perl for Apache
 License:        Apache-2.0
@@ -26,8 +26,6 @@ Group:          Productivity/Networking/Web/Servers
 Url:            http://perl.apache.org/
 Source0:        http://apache.miloslavbrada.cz/perl/%{srcname}-%{version}.tar.gz
 Patch1:         avoid-broken-provides.diff
-# PATCH-FIX-UPSTREAM http://svn.apache.org/viewvc?view=revision&revision=1717474
-Patch2:         mod_perl-add_support_for_perl_5.22.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
 BuildRequires:  db-devel
@@ -82,7 +80,6 @@ software depending on apache2-mod_perl.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch1 -p1
-%patch2
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline"
diff --git a/mod_perl-2.0.10.tar.gz b/mod_perl-2.0.10.tar.gz
new file mode 100644
index 0000000..0f0a30a
--- /dev/null
+++ b/mod_perl-2.0.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1cf83ed4ea3a9dfceaa6d9662ff645177090749881093051020bf42f9872b64
+size 3846211
diff --git a/mod_perl-2.0.9.tar.gz b/mod_perl-2.0.9.tar.gz
deleted file mode 100644
index 058b40c..0000000
--- a/mod_perl-2.0.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0260f26ab771c1c95fadc67544b3400e420bb30b8a77565d2d02ad05498ef52b
-size 3846584
diff --git a/mod_perl-add_support_for_perl_5.22.patch b/mod_perl-add_support_for_perl_5.22.patch
deleted file mode 100644
index 717ae56..0000000
--- a/mod_perl-add_support_for_perl_5.22.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-Index: t/response/TestModperl/env.pm
-===================================================================
---- t/response/TestModperl/env.pm.orig	2015-06-18 22:13:58.000000000 +0200
-+++ t/response/TestModperl/env.pm	2015-12-16 14:57:47.432881096 +0100
-@@ -15,7 +15,7 @@ use Apache2::Const -compile => 'OK';
- sub handler {
-     my $r = shift;
- 
--    plan $r, tests => 23 + keys(%ENV);
-+    plan $r, tests => 23 + 3 * keys(%ENV);
- 
-     my $env = $r->subprocess_env;
- 
-@@ -75,6 +75,8 @@ sub handler {
-     for my $key (sort keys %ENV) {
-         eval { delete $ENV{$key}; };
-         ok t_cmp($@, '', $key);
-+        ok t_cmp($ENV{$key}, undef, "ENV{$key} is empty");
-+        ok t_cmp($env->get($key), undef, "subprocess_env($key) is empty");
-     }
- 
-     Apache2::Const::OK;
-Index: Changes
-===================================================================
---- Changes.orig	2015-06-18 22:13:50.000000000 +0200
-+++ Changes	2015-12-16 14:57:47.433881111 +0100
-@@ -10,6 +10,8 @@ Also refer to the Apache::Test changes l
- 
- =over 3
- 
-+Add support for Perl 5.22.x. [Niko Tyni <ntyni@iki.fi>, Steve Hay]
-+
- =item 2.0.9 June 18, 2015
- 
- Add note to README about MP_INLINE problem when building with GCC 5.
-Index: src/modules/perl/mod_perl.c
-===================================================================
---- src/modules/perl/mod_perl.c.orig	2015-06-18 22:13:55.000000000 +0200
-+++ src/modules/perl/mod_perl.c	2015-12-16 14:57:47.434881127 +0100
-@@ -262,6 +262,8 @@ PerlInterpreter *modperl_startup(server_
-         exit(1);
-     }
- 
-+    modperl_env_init(aTHX);
-+
-     /* suspend END blocks to be run at server shutdown */
-     endav = PL_endav;
-     PL_endav = (AV *)NULL;
-@@ -576,9 +578,6 @@ static apr_status_t modperl_sys_init(voi
-     /* modifies PL_ppaddr */
-     modperl_perl_pp_set_all();
- 
--    /* modifies PL_vtbl_env{elem} */
--    modperl_env_init();
--
-     return APR_SUCCESS;
- }
- 
-@@ -597,8 +596,6 @@ static apr_status_t modperl_sys_term(voi
- 
-     MP_TRACE_i(MP_FUNC, "mod_perl sys term");
- 
--    modperl_env_unload();
--
-     modperl_perl_pp_unset_all();
- 
-     PERL_SYS_TERM();
-Index: src/modules/perl/modperl_env.c
-===================================================================
---- src/modules/perl/modperl_env.c.orig	2015-06-18 22:13:54.000000000 +0200
-+++ src/modules/perl/modperl_env.c	2015-12-16 14:57:47.434881127 +0100
-@@ -121,6 +121,7 @@ static void modperl_env_table_populate(p
-     const apr_array_header_t *array;
-     apr_table_entry_t *elts;
- 
-+    modperl_env_init(aTHX);
-     modperl_env_untie(mg_flags);
- 
-     array = apr_table_elts(table);
-@@ -431,14 +432,10 @@ void modperl_env_request_untie(pTHX_ req
- #endif
- }
- 
--/* to store the original virtual tables
-- * these are global, not per-interpreter
-+/* handy access to perl's original virtual tables
-  */
--static MGVTBL MP_PERL_vtbl_env;
--static MGVTBL MP_PERL_vtbl_envelem;
--
- #define MP_PL_vtbl_call(name, meth) \
--    MP_PERL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
-+    PL_vtbl_##name.svt_##meth(aTHX_ sv, mg)
- 
- #define MP_dENV_KEY \
-     STRLEN klen; \
-@@ -529,6 +526,26 @@ static int modperl_env_magic_clear_all(p
-     return 0;
- }
- 
-+static int modperl_env_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
-+{
-+    MP_TRACE_e(MP_FUNC, "setting up %%ENV element magic");
-+    sv_magicext(nsv, mg->mg_obj, toLOWER(mg->mg_type), &MP_vtbl_envelem, name, namlen);
-+
-+    return 1;
-+}
-+
-+static int modperl_env_magic_local_all(pTHX_ SV *nsv, MAGIC *mg)
-+{
-+    MAGIC *nmg;
-+    MP_TRACE_e(MP_FUNC, "localizing %%ENV");
-+    nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, &MP_vtbl_env, (char*)NULL, 0);
-+    nmg->mg_ptr = mg->mg_ptr;
-+    nmg->mg_flags |= MGf_COPY;
-+    nmg->mg_flags |= MGf_LOCAL;
-+
-+    return 1;
-+}
-+
- static int modperl_env_magic_set(pTHX_ SV *sv, MAGIC *mg)
- {
-     request_rec *r = (request_rec *)EnvMgObj;
-@@ -613,15 +630,18 @@ static int modperl_env_magic_get(pTHX_ S
- #endif
- 
- /* override %ENV virtual tables with our own */
--static MGVTBL MP_vtbl_env = {
-+MGVTBL MP_vtbl_env = {
-     0,
-     modperl_env_magic_set_all,
-     0,
-     modperl_env_magic_clear_all,
--    0
-+    0,
-+    modperl_env_magic_copy,
-+    0,
-+    modperl_env_magic_local_all
- };
- 
--static MGVTBL MP_vtbl_envelem = {
-+MGVTBL MP_vtbl_envelem = {
-     0,
-     modperl_env_magic_set,
-     0,
-@@ -629,22 +649,64 @@ static MGVTBL MP_vtbl_envelem = {
-     0
- };
- 
--void modperl_env_init(void)
-+void modperl_env_init(pTHX)
- {
--    /* save originals */
--    StructCopy(&PL_vtbl_env, &MP_PERL_vtbl_env, MGVTBL);
--    StructCopy(&PL_vtbl_envelem, &MP_PERL_vtbl_envelem, MGVTBL);
-+    MAGIC *mg;
-+
-+    /* Find the 'E' magic on %ENV */
-+    if (!my_perl)
-+        return;
-+    if (!PL_envgv)
-+        return;
-+    if (!SvRMAGICAL(ENVHV))
-+        return;
-+    mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
-+    if (!mg)
-+        return;
-+       
-+    /* Ignore it if it isn't perl's original version */
-+    if (mg->mg_virtual != &PL_vtbl_env)
-+        return;
-+
-+    MP_TRACE_e(MP_FUNC, "env_init - ptr: %x obj: %x flags: %x",
-+               mg->mg_ptr, mg->mg_obj, mg->mg_flags);
- 
--    /* replace with our versions */
--    StructCopy(&MP_vtbl_env, &PL_vtbl_env, MGVTBL);
--    StructCopy(&MP_vtbl_envelem, &PL_vtbl_envelem, MGVTBL);
-+    /* Remove it */
-+    mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
-+
-+    /* Add our version instead */
-+    mg = sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &MP_vtbl_env, (char*)NULL, 0);
-+    mg->mg_flags |= MGf_COPY;
-+    mg->mg_flags |= MGf_LOCAL;
- }
- 
--void modperl_env_unload(void)
-+void modperl_env_unload(pTHX)
- {
--    /* restore originals */
--    StructCopy(&MP_PERL_vtbl_env, &PL_vtbl_env, MGVTBL);
--    StructCopy(&MP_PERL_vtbl_envelem, &PL_vtbl_envelem, MGVTBL);
-+    MAGIC *mg;
-+
-+    /* Find the 'E' magic on %ENV */
-+    if (!my_perl)
-+        return;
-+    if (!PL_envgv)
-+        return;
-+    if (!SvRMAGICAL(ENVHV))
-+        return;
-+    mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env);
-+    if (!mg)
-+        return;
-+
-+    /* Ignore it if it isn't our version */
-+    if (mg->mg_virtual != &MP_vtbl_env)
-+        return;
-+
-+    MP_TRACE_e(MP_FUNC, "env_unload - ptr: %x obj: %x flags: %x",
-+               mg->mg_ptr, mg->mg_obj, mg->mg_flags);
-+
-+    /* Remove it */
-+    mg_free_type((SV*)ENVHV, PERL_MAGIC_env);
-+
-+    /* Restore perl's original version */
-+    sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &PL_vtbl_env, (char*)NULL, 0);
- }
- 
- /*
-Index: src/modules/perl/modperl_env.h
-===================================================================
---- src/modules/perl/modperl_env.h.orig	2015-06-18 22:13:54.000000000 +0200
-+++ src/modules/perl/modperl_env.h	2015-12-16 14:57:47.434881127 +0100
-@@ -28,7 +28,7 @@
-     MP_magical_tie(ENVHV, mg_flags)
- 
- #define modperl_envelem_tie(sv, key, klen) \
--    sv_magic(sv, (SV *)NULL, 'e', key, klen)
-+    sv_magicext(sv, (SV *)NULL, PERL_MAGIC_envelem, &MP_vtbl_envelem, key, klen)
- 
- void modperl_env_hash_keys(pTHX);
- 
-@@ -58,9 +58,12 @@ void modperl_env_request_tie(pTHX_ reque
- 
- void modperl_env_request_untie(pTHX_ request_rec *r);
- 
--void modperl_env_init(void);
-+void modperl_env_init(pTHX);
- 
--void modperl_env_unload(void);
-+void modperl_env_unload(pTHX);
-+
-+MGVTBL MP_vtbl_env;
-+MGVTBL MP_vtbl_envelem;
- 
- #endif /* MODPERL_ENV_H */
- 
-Index: src/modules/perl/modperl_perl.c
-===================================================================
---- src/modules/perl/modperl_perl.c.orig	2015-06-18 22:13:55.000000000 +0200
-+++ src/modules/perl/modperl_perl.c	2015-12-16 14:57:47.434881127 +0100
-@@ -181,6 +181,8 @@ void modperl_perl_destruct(PerlInterpret
-         }
-     }
- 
-+    modperl_env_unload(perl);
-+
-     perl_destruct(perl);
- 
-     /* XXX: big bug in 5.6.1 fixed in 5.7.2+