diff --git a/.gitignore b/.gitignore
index 490ec85..5b35722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 /ustl-2.1.tar.gz
+/ustl-2.3.tar.gz
+/ustl-2.4.tar.gz
+/ustl-2.5.tar.gz
diff --git a/sources b/sources
index 9076f97..26173d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12189009af2ce5c31d72782441eca291  ustl-2.1.tar.gz
+SHA512 (ustl-2.5.tar.gz) = 3ed26daa5773df9e667d4311778b026fc012d7dadf35eb4fcf26b7c0dacb3fa120ce8e3a9db4c5929bfa1325342a28c601471b63d8c40e70e5d96eb3976fdd27
diff --git a/ustl.spec b/ustl.spec
index 9c2627c..2231990 100644
--- a/ustl.spec
+++ b/ustl.spec
@@ -1,11 +1,15 @@
 Name:           ustl
-Version:        2.1
-Release:        3%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        A size-optimized STL implementation
 License:        MIT
 URL:            http://msharov.github.io/ustl/
 Source0:        https://github.com/msharov/ustl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
+BuildRequires:  gcc-c++
+BuildRequires:  make
+BuildRequires:  sed
+
 %description
 The C++ standard template library (STL) is a collection of common containers 
 and algorithms in template form. Unfortunately its standard incarnation 
@@ -39,17 +43,20 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+
 # No silent build.
 sed -i -e 's|\t@|\t|g' Makefile
 
 # Don't strip the symbols, substituted with correct ldflags.
-sed -i -e 's|-s |%{?__global_ldflags} |g' Config.mk.in
-sed -i -e 's|/usr/lib|%{_libdir}|g'                    \
-       -e 's|CXXFLAGS	:=|override CXXFLAGS	+=|g'  \
-       Config.mk.in
+sed -i -e 's|/usr/lib|%{_libdir}|g'  \
+    -i -e 's|-s |-Wl,-z,relro |g'  \
+       -e 's|CXXFLAGS	:=|override CXXFLAGS	+=|g' \
+   Config.mk.in
 
-# Do not interfere with optflags
-sed -i -e 's|-march=native||g' configure
+# Do not interfere with optflags, hardened build flags.
+sed -i -e 's|-march=native||g' \
+    -i -e 's|-shared |-shared -Wl,-z,now |g' \
+   configure
 
 %build
 ./configure \
@@ -59,10 +66,11 @@ sed -i -e 's|-march=native||g' configure
 %endif
   --with-libstdc++ --force-inline
 
-%make_build CXXFLAGS+="%{optflags}"
+make %{?_smp_mflags} \
+  CXXFLAGS+="%{optflags} -fPIC"
 
 %install
-%make_install LIBDIR="%{buildroot}%{_libdir}"
+make install LIBDIR="%{buildroot}%{_libdir}"
 
 chmod 755 -v %{buildroot}%{_libdir}/*
 
@@ -74,16 +82,37 @@ make check
 %postun -p /sbin/ldconfig
 
 %files
-%doc LICENSE
+%{!?_licensedir:%global license %doc}
+%license LICENSE
+%doc README
 %{_libdir}/libustl.so.*
 
 %files devel
-%doc README docs/
+%doc docs/*
 %{_includedir}/ustl.h
 %{_includedir}/ustl/
 %{_libdir}/libustl.so
 
 %changelog
+* Sat Dec 24 2016 Denis Fateyev <denis@fateyev.com> - 2.5-1
+- Update to 2.5 version
+
+* Fri May 20 2016 Denis Fateyev <denis@fateyev.com> - 2.4-1
+- Update to 2.4 version
+- Dropping obsolete patches
+
+* Mon Feb 29 2016 Denis Fateyev <denis@fateyev.com> - 2.3-1
+- Update EPEL branches to 2.3 version
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Fri Aug 08 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 2.1-3
 - Remove -march=native
 - Disable SSE on ix86 (not supported by default optflags)