diff --git a/libpq.spec b/libpq.spec
index 6357a62..f61db74 100644
--- a/libpq.spec
+++ b/libpq.spec
@@ -4,7 +4,7 @@
 Summary: PostgreSQL client library
 Name: libpq
 Version: %{majorversion}.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: PostgreSQL
 Url: http://www.postgresql.org/
@@ -99,7 +99,13 @@ done
 
 # remove files not to be packaged
 find $RPM_BUILD_ROOT -name '*.a' -delete
+# preserve just errcodes.h
+mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils/errcodes.h \
+   $RPM_BUILD_ROOT%{_includedir}/pgsql 
 rm -r $RPM_BUILD_ROOT%_includedir/pgsql/server
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils
+mv $RPM_BUILD_ROOT%{_includedir}/pgsql/errcodes.h \
+   $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils 
 
 %multilib_fix_c_header --file "%_includedir/pg_config.h"
 %multilib_fix_c_header --file "%_includedir/pg_config_ext.h"
@@ -132,6 +138,9 @@ find_lang_bins %name-devel.lst  pg_config
 %_libdir/pkgconfig/libpq.pc
 
 %changelog
+* Tue Jun 18 2024 Filip Janus <fjanus@redhat.com> - 16.1-5
+- Ship errcodes.h in -devel package (kea package requires errorcodes) 
+
 * Tue Feb 20 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 16.1-4
 - Backport OpenSSL 3.2 fix from upstream master