diff --git a/libcap-ng-0.8.4.tar.gz b/libcap-ng-0.8.4.tar.gz
deleted file mode 100644
index b481eac..0000000
--- a/libcap-ng-0.8.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a
-size 453749
diff --git a/libcap-ng-0.8.5.tar.gz b/libcap-ng-0.8.5.tar.gz
new file mode 100644
index 0000000..e8fcd16
--- /dev/null
+++ b/libcap-ng-0.8.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff
+size 460149
diff --git a/libcap-ng-python.spec b/libcap-ng-python.spec
index eb85c85..7e76095 100644
--- a/libcap-ng-python.spec
+++ b/libcap-ng-python.spec
@@ -17,10 +17,8 @@
 
 
 %define sover  0
-%bcond_without python2
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           libcap-ng-python
-Version:        0.8.4
+Version:        0.8.5
 Release:        0
 Summary:        An alternate Linux/POSIX capabilities library
 License:        LGPL-2.1-or-later
@@ -28,12 +26,12 @@ Group:          Development/Libraries/C and C++
 URL:            https://people.redhat.com/sgrubb/libcap-ng
 Source0:        https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz
 Source1:        baselibs.conf
-Source99:       libcap-ng.rpmlintrc
-BuildRequires:  %{python_module devel}
+BuildRequires:  fdupes
 BuildRequires:  kernel-headers >= 2.6.11
 BuildRequires:  libcap-ng-devel = %{version}
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
+BuildRequires:  python3-devel
 BuildRequires:  swig
 
 %description
@@ -41,15 +39,6 @@ libcap-ng is a library providing an alternate mechanism to libcap to
 inspect and set Linux process and file capabilities (modeled upon a
 withdrawn POSIX.1e draft).
 
-%package -n python2-capng
-Summary:        Python bindings for libcap-ng library
-Group:          Development/Libraries/Python
-Requires:       libcap-ng%{sover} = %{version}
-
-%description -n python2-capng
-The libcap-ng-python package contains the bindings so that libcap-ng
-and can be used by Python applications.
-
 %package -n python3-capng
 Summary:        Python bindings for libcap-ng library
 Group:          Development/Libraries/Python
@@ -65,25 +54,17 @@ and can be used by Python applications.
 %build
 %configure \
     --disable-static \
-%if %{with python2}
-    --with-python \
-%endif
     --with-python3
-make %{?_smp_mflags}
+make %{?_smp_mflags} PYTHON="python3"
 
 %install
-%if %{with python2}
-%make_install -C bindings/python
-%endif
-%make_install -C bindings/python3
+%make_install -C bindings/python3 PYTHON="python3"
 find %{buildroot} -type f -name "*.la" -delete -print
-
-%if %{with python2}
-%files -n python2-capng
-%{python2_sitearch}/*
-%endif
+%fdupes %{buildroot}%{python3_sitearch}
 
 %files -n python3-capng
-%{python3_sitearch}/*
+%pycache_only %{python3_sitearch}/__pycache__/capng*.pyc
+%{python3_sitearch}/_capng.so
+%{python3_sitearch}/capng.py
 
 %changelog
diff --git a/libcap-ng.changes b/libcap-ng.changes
index a34bc58..c4d73be 100644
--- a/libcap-ng.changes
+++ b/libcap-ng.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon May 20 17:29:35 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to version 0.8.5:
+  * Remove python global exception handler since it's deprecated
+  * Make the utilities link against just built libraries
+  * Remove unused macro in cap-ng.h
+- Remove libcap-ng.rpmlintrc, it doesn't seem to be used any more.
+
 -------------------------------------------------------------------
 Tue Jan  2 10:35:45 UTC 2024 - jun wang <jgwang@suse.com>
 
diff --git a/libcap-ng.rpmlintrc b/libcap-ng.rpmlintrc
deleted file mode 100644
index c5064b3..0000000
--- a/libcap-ng.rpmlintrc
+++ /dev/null
@@ -1 +0,0 @@
-addFilter("libcap-ng-devel..*: W: no-dependency-on libcap-ng/libcap-ng-libs/liblibcap-ng")
diff --git a/libcap-ng.spec b/libcap-ng.spec
index b4761c6..a2b75b9 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -20,7 +20,7 @@
 %define ambient_sover 0
 
 Name:           libcap-ng
-Version:        0.8.4
+Version:        0.8.5
 Release:        0
 Summary:        An alternate Linux/POSIX capabilities library
 License:        LGPL-2.1-or-later
@@ -28,7 +28,6 @@ Group:          Development/Libraries/C and C++
 URL:            https://people.redhat.com/sgrubb/libcap-ng
 Source0:        https://people.redhat.com/sgrubb/%{name}/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
-Source99:       libcap-ng.rpmlintrc
 BuildRequires:  kernel-headers >= 2.6.11
 BuildRequires:  pkgconfig