diff --git a/0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch b/0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
deleted file mode 100644
index 7862a69..0000000
--- a/0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 3f67eb68e05ae87ec985f413b97b4cdd2922533d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Fri, 14 Jul 2017 17:53:43 +0200
-Subject: [PATCH] [libpng16] Revised pngpriv.h to use PNG_VERSION_INFO_ONLY
- instead of
-
-PNG_ARM_NEON_IMPLEMENTATION == 2 to exclude some definitions that assembler
-cannot recognize.
-
-[SBruens] Cherry-picked from 54126d5c59653e744ee8af81ba61fd910ce4d295,
-removed merge conflicts.
----
- pngpriv.h | 29 +++++++++++++++--------------
- 1 file changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/pngpriv.h b/pngpriv.h
-index a062a8da1..f50de2b86 100644
---- a/pngpriv.h
-+++ b/pngpriv.h
-@@ -452,6 +452,21 @@
- #  define png_fixed_error(s1,s2) png_err(s1)
- #endif
- 
-+/* Some fixed point APIs are still required even if not exported because
-+ * they get used by the corresponding floating point APIs.  This magic
-+ * deals with this:
-+ */
-+#ifdef PNG_FIXED_POINT_SUPPORTED
-+#  define PNGFAPI PNGAPI
-+#else
-+#  define PNGFAPI /* PRIVATE */
-+#endif
-+
-+#ifndef PNG_VERSION_INFO_ONLY
-+/* Other defines specific to compilers can go here.  Try to keep
-+ * them inside an appropriate ifdef/endif pair for portability.
-+ */
-+
- /* C allows up-casts from (void*) to any pointer and (const void*) to any
-  * pointer to a const object.  C++ regards this as a type error and requires an
-  * explicit, static, cast and provides the static_cast<> rune to ensure that
-@@ -480,20 +495,6 @@
- #  define png_aligncastconst(type, value) ((const void*)(value))
- #endif /* __cplusplus */
- 
--/* Some fixed point APIs are still required even if not exported because
-- * they get used by the corresponding floating point APIs.  This magic
-- * deals with this:
-- */
--#ifdef PNG_FIXED_POINT_SUPPORTED
--#  define PNGFAPI PNGAPI
--#else
--#  define PNGFAPI /* PRIVATE */
--#endif
--
--#ifndef PNG_VERSION_INFO_ONLY
--/* Other defines specific to compilers can go here.  Try to keep
-- * them inside an appropriate ifdef/endif pair for portability.
-- */
- #if defined(PNG_FLOATING_POINT_SUPPORTED) ||\
-     defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
-    /* png.c requires the following ANSI-C constants if the conversion of
--- 
-2.13.2
-
diff --git a/libpng-1.6.30.tar.xz b/libpng-1.6.30.tar.xz
deleted file mode 100644
index f49f8f3..0000000
--- a/libpng-1.6.30.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:267c332ffff70cc599d3929207869f698798f1df143aa5f9597b007c14353666
-size 988608
diff --git a/libpng-1.6.30.tar.xz.asc b/libpng-1.6.30.tar.xz.asc
deleted file mode 100644
index e6ac28f..0000000
--- a/libpng-1.6.30.tar.xz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJZU/sVAAoJEPVJhL+hbGQPxNwP/jyKzen8CVdWwPRvsFC/lT5x
-a1jlXlV3ejdIlX/PF7kfPKb8ZdbRTXkpky6nYAi64vgbUrR1ZzUqd/M1BBnenOWo
-t63V7oiRec/ELdDPP/c3ccuv3oykdmC7lexqQbcJGsooRK9mm7/M8RE2FTgd58LV
-DmwOzJeTnEFJVs25SlteWx77eLApheP3bfJdnYnhm3a40a1e4Tb3rgz1Nmi0lrHG
-2y4Khkf4fTMkXxU+CzuidAEGa8GLBhwLoedPP4VjcHvZ3eAMXIfTXEaD2qHuU53S
-SIiWjlujPY30fPDDB2bobIv7mQvTTqSpCeHSmIV+XwLRwylpm1kSSRYew3CPSpOd
-8mXigv7hAg8gpjBgZ2bQoGs2ss8JIzU7Pellwdjoy1V8uDJWJHWogFzpuVCPuz6u
-vvs16XmjxteXM8ndMOzKkACbHKYJLZ6Eb0GtE6hHTF8bnvrzHld7TDFQg2x1PYGM
-quO7mYjhFEzqOH8ZRvL1pBXOj/bf2zAH8EIG7s3gO/N3JkExvu/JuLKRxrWU8HbU
-rjlC/Xchdq4ffhaanj0DDFf9Gdtn8z0xBBFiqwtybOWunDyoFXenWf0TRvNZyv54
-vOPmN4l6VWGeepLLQ3lZYF3mMlus69uoX47yQI5OuFijHoT/NIqrnMdQUCBcPcuJ
-ATGjcBKUCYcDPbQFX2zK
-=OctP
------END PGP SIGNATURE-----
diff --git a/libpng-1.6.31.tar.xz b/libpng-1.6.31.tar.xz
new file mode 100644
index 0000000..48c995e
--- /dev/null
+++ b/libpng-1.6.31.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:232a602de04916b2b5ce6f901829caf419519e6a16cc9cd7c1c91187d3ee8b41
+size 991824
diff --git a/libpng-1.6.31.tar.xz.asc b/libpng-1.6.31.tar.xz.asc
new file mode 100644
index 0000000..dcfc00a
--- /dev/null
+++ b/libpng-1.6.31.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJZecSyAAoJEPVJhL+hbGQPJnYQAKrynYRwq4L7tBi+JpQRtLzf
+C2kXVB3kKxLsCBViy/PsDoo8Fl6NdY1t+OCaQmM4YGzBQpYLIDx76SICH1j/tHAI
+uLDbfJRxYMXudC3DdqN5+6A3t2/uDP2Y9zP6WtC70Ns06za5w6pvl2izCSAJABo/
+TM2BjBJD30ZTpgVVlvhtLEJbiKtdmFQdrpcFIDOOiKGNTuPhOE/DTcs9eGYppgOl
+kbrfJkrXCUq8dMbC0LCIMliksZARbhucTEykC2cbgMKD8iSvcCsaUUOlVHdbuP1k
+a1AJ1zRboAT4+3xlwGVzSR0ilnrQ1fnC+jf0ztx8HnjRBFF3McOULcgpsjsy9V2E
+UsRGVtGO4A829fEjHpXiGkdvcJfWekxbxjXmxOD3g79w4KVrQaAJ5ht0Q+p8iOYl
+cBFcHvDYS5+BlMszr1VdUcH0aeRZKzVnpFGXYi5/DFrotBo0OeZMp1yYOOLeiDFQ
+fQUlGg3KNnPDVIML2GxSfyEuAZ/luEI4zYHPEe0hHv1x5IEFDY30oYVeCQbg2sfa
+p+1ejLOhZ/sJag098Pd4+8l2StqOIETNf0ma+8l5KqHBSECvrBrexAQkr6dT550S
+4lft2wn9+JAYJkVvc9IWcQQZ1pTwFQPFA1eL5PLCfJXu1DP3/f7kyn0nEoGjc3Uu
++Ga+Ec0Tz6dNDgfvaDNX
+=Ac3P
+-----END PGP SIGNATURE-----
diff --git a/libpng16.changes b/libpng16.changes
index c0040ad..6e760ec 100644
--- a/libpng16.changes
+++ b/libpng16.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Aug  7 09:46:11 UTC 2017 - pgajdos@suse.com
+
+- update to 1.6.31:
+  * Guard the definition of _POSIX_SOURCE in pngpriv.h.
+  * Revised pngpriv.h to work around failure to compile 
+    arm/filter_neon.S.
+  * Added "Requires: zlib" to libpng.pc.in.
+  * Added special case for FreeBSD in arm/filter_neon.S.
+  * Changed "int" to "png_size_t" in intel/filter_sse2.c to prevent
+    possible integer overflow.
+  * Added eXIf chunk support.
+- remove upstreamed
+  0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
+
 -------------------------------------------------------------------
 Wed Jul 19 15:51:28 UTC 2017 - stefan.bruens@rwth-aachen.de
 
diff --git a/libpng16.spec b/libpng16.spec
index cace581..3d3f804 100644
--- a/libpng16.spec
+++ b/libpng16.spec
@@ -19,7 +19,7 @@
 #
 %define major   1
 %define minor   6
-%define micro   30
+%define micro   31
 %define branch  %{major}%{minor}
 %define libname libpng%{branch}-%{branch}
 
@@ -35,8 +35,6 @@ Source1:        ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{versio
 Source2:        libpng16.keyring
 Source3:        rpm-macros.libpng-tools
 Source4:        baselibs.conf
-# PATCH-FIX-UPSTREAM 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch stefan.bruens@rwth-aachen.de -- Cherry-pick upstream fix for ARM build, fixed in 1.6.31
-Patch0:         0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch
 #BuildRequires:  gpg-offline
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -111,7 +109,6 @@ PNG files.
 
 %prep
 %setup -n libpng-%{version}
-%patch0 -p1
 
 %build
 # PNG_SAFE_LIMITS_SUPPORTED: http://www.openwall.com/lists/oss-security/2015/01/10/1