diff --git a/.gitignore b/.gitignore
index a8caf02..2ccd5fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/postgresql-8.4.22.tar.bz2
-SOURCES/postgresql-9.2.18-US.pdf
-SOURCES/postgresql-9.2.18.tar.bz2
+SOURCES/postgresql-9.2.21-US.pdf
+SOURCES/postgresql-9.2.21.tar.bz2
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 9d3769c..26d9041 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
 66a1286c4983121af35b76c97b97288013edc151 SOURCES/postgresql-8.4.22.tar.bz2
-83d52f97650e8302d8c353ad5359bd89e226f533 SOURCES/postgresql-9.2.18-US.pdf
-703f237f2d70df3809733852a9c2421e5b4fdba9 SOURCES/postgresql-9.2.18.tar.bz2
+3cdeac0d7616bf048911c9ff7c233825f3c21094 SOURCES/postgresql-9.2.21-US.pdf
+150f9dda7c03379933cc4f804f6e37d7c8518114 SOURCES/postgresql-9.2.21.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index c15ba99..7f3a205 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.2
-Version: 9.2.18
+Version: 9.2.21
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -270,6 +270,15 @@ Embedded C Postgres preprocessor. You need to install this package if you want
 to develop applications which will interact with a PostgreSQL server.
 
 
+%package static
+Summary: Statically linked PostgreSQL libraries
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description static
+Statically linked PostgreSQL libraries that do not have dynamically linked
+counterparts.
+
+
 %if %upgrade
 %package upgrade
 Summary: Support for upgrading from the previous major release of PostgreSQL
@@ -765,7 +774,7 @@ mv $RPM_BUILD_ROOT%{_docdir}/pgsql/html doc
 rm -rf $RPM_BUILD_ROOT%{_docdir}/pgsql
 
 # remove files not to be packaged
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/{libecpg,libpq,libecpg_compat,libpgtypes}.a
 %if !%upgrade
 rm -f $RPM_BUILD_ROOT%{_bindir}/pg_upgrade
 rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/pg_upgrade_support.so
@@ -1105,6 +1114,9 @@ fi
 %{_mandir}/man1/ecpg.*
 %{_mandir}/man3/SPI_*
 
+%files static
+%{_libdir}/libpgport.a
+
 %if %upgrade
 %files upgrade
 %{_bindir}/pg_upgrade
@@ -1150,6 +1162,15 @@ fi
 %endif
 
 %changelog
+* Thu May 11 2017 Petr Kubat <pkubat@redhat.com> - 9.2.21-1
+- update to 9.2.21 per release notes
+  http://www.postgresql.org/docs/9.2/static/release-9-2-21.html
+  http://www.postgresql.org/docs/9.2/static/release-9-2-20.html
+  http://www.postgresql.org/docs/9.2/static/release-9-2-19.html
+
+* Wed Feb 22 2017 Pavel Raiskup <praiskup@redhat.com> - 9.2.18-2
+- package libpgport.a (rhbz#1305979)
+
 * Wed Aug 17 2016 Petr Kubat <pkubat@redhat.com> - 9.2.18-1
 - update to 9.2.18 per release notes
   http://www.postgresql.org/docs/9.2/static/release-9-2-18.html