diff --git a/.gitignore b/.gitignore
index 89364e0..f04166d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /libpng-1.6.12.tar.gz
 /libpng-1.6.14.tar.gz
 /libpng-1.6.16.tar.gz
+/libpng-1.6.17.tar.gz
diff --git a/libpng.spec b/libpng.spec
index 2d775c7..fcf802d 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,18 +1,18 @@
-Summary: A library of functions for manipulating PNG image format files
-Name: libpng
-Epoch: 2
-Version: 1.6.16
-Release: 3%{?dist}
-License: zlib
-Group: System Environment/Libraries
-URL: http://www.libpng.org/pub/png/
+Summary:       A library of functions for manipulating PNG image format files
+Name:          libpng
+Epoch:         2
+Version:       1.6.17
+Release:       1%{?dist}
+License:       zlib
+Group:         System Environment/Libraries
+URL:           http://www.libpng.org/pub/png/
 
 # Note: non-current tarballs get moved to the history/ subdirectory,
 # so look there if you fail to retrieve the version you want
-Source0: ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-%{version}.tar.gz
-Source1: pngusr.dfa
-Patch0: libpng-multilib.patch
-Patch1: libpng-fix-arm-neon.patch
+Source0:       ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-%{version}.tar.gz
+Source1:       pngusr.dfa
+Patch0:        libpng-multilib.patch
+Patch1:        libpng-fix-arm-neon.patch
 
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake libtool
@@ -28,10 +28,10 @@ Libpng should be installed if you need to manipulate PNG format image
 files.
 
 %package devel
-Summary: Development tools for programs to manipulate PNG image format files
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: zlib-devel%{?_isa} pkgconfig%{?_isa}
+Summary:       Development tools for programs to manipulate PNG image format files
+Group:         Development/Libraries
+Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:      zlib-devel%{?_isa} pkgconfig%{?_isa}
 
 %description devel
 The libpng-devel package contains header files and documentation necessary
@@ -42,9 +42,9 @@ files, you should install libpng-devel.  You'll also need to install
 the libpng package.
 
 %package static
-Summary: Static PNG image format file library
-Group: Development/Libraries
-Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Summary:       Static PNG image format file library
+Group:         Development/Libraries
+Requires:      %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description static
 The libpng-static package contains the statically linkable version of libpng.
@@ -52,9 +52,9 @@ Linking to static libraries is discouraged for most applications, but it is
 necessary for some boot packages.
 
 %package tools
-Summary: Tools for PNG image format file library
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Summary:       Tools for PNG image format file library
+Group:         Development/Libraries
+Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description tools
 The libpng-tools package contains tools used by the authors of libpng.
@@ -109,6 +109,9 @@ make check
 %{_bindir}/pngfix
 
 %changelog
+* Tue Apr 07 2015 Petr Hracek <phracek@redhat.com> - 2:1.6.17-1
+- New upstream release 1.6.17 (#1209145)
+
 * Sun Mar 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2:1.6.16-3
 - Use %%license
 - Move docs to devel package as they're all related to dev
diff --git a/pngusr.dfa b/pngusr.dfa
index 2eca9f6..02e484d 100644
--- a/pngusr.dfa
+++ b/pngusr.dfa
@@ -1,5 +1,3 @@
-# Enable use of "safe" default limits on image size and chunk size.
-option SAFE_LIMITS on
 # However, the default defaults seem a tad too restrictive for general
 # purpose use, so back them off a little.
 setting USER_CHUNK_CACHE_MAX default 1000
diff --git a/sources b/sources
index 3fae8ce..cd3ef03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a4ad377919ab15b54f6cb6a3ae2622d  libpng-1.6.16.tar.gz
+134282f1752dcf4cd81a37b8ff421cef  libpng-1.6.17.tar.gz