diff --git a/.gitignore b/.gitignore
index 75ab289..97f67f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 virt-firmware-v1.2.tar.gz
+virt-firmware-v1.6.tar.gz
diff --git a/0001-setup.cfg-drop-peutils.patch b/0001-setup.cfg-drop-peutils.patch
new file mode 100644
index 0000000..c7243b5
--- /dev/null
+++ b/0001-setup.cfg-drop-peutils.patch
@@ -0,0 +1,37 @@
+From b6db3b1366fe61a7cbe176c92420076bc6aa5936 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 14 Nov 2022 15:58:07 +0100
+Subject: [PATCH] setup.cfg: drop peutils
+
+---
+ setup.cfg | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 5f57feac114d..307d6e279d4c 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -17,10 +17,8 @@ packages =
+     virt/firmware
+     virt/firmware/efi
+     virt/firmware/varstore
+-    virt/peutils
+ install_requires =
+     cryptography
+-    pefile
+ 
+ [options.entry_points]
+ console_scripts =
+@@ -29,9 +27,6 @@ console_scripts =
+     virt-fw-dump = virt.firmware.dump:main
+     virt-fw-sigdb = virt.firmware.sigdb:main
+     migrate-vars = virt.firmware.migrate:main
+-    pe-dumpinfo = virt.peutils.peutils:pe_dumpinfo
+-    pe-listsigs = virt.peutils.peutils:pe_listsigs
+-    pe-addsigs = virt.peutils.peutils:pe_addsigs
+ 
+ [options.package_data]
+ virt/firmware = certs/*.pem, aws/dict.v0
+-- 
+2.38.1
+
diff --git a/python-virt-firmware.spec b/python-virt-firmware.spec
index ad702eb..1ed2691 100644
--- a/python-virt-firmware.spec
+++ b/python-virt-firmware.spec
@@ -1,17 +1,20 @@
-%global pypi_version 1.2
+%global pypi_version 1.6
 
 Name:           python-virt-firmware
 Version:        %{pypi_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Tools for virtual machine firmware volumes
 
 License:        GPLv2
 URL:            https://gitlab.com/kraxel/virt-firmware
 Source0:        https://gitlab.com/kraxel/virt-firmware/-/archive/v%{pypi_version}/virt-firmware-v%{pypi_version}.tar.gz
+Patch1:         0001-setup.cfg-drop-peutils.patch
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
+BuildRequires:  python3dist(cryptography)
 BuildRequires:  python3dist(setuptools)
+BuildRequires:  make
 
 %description
 Tools for ovmf / armvirt firmware volumes This is a small collection of tools
@@ -22,7 +25,7 @@ to enroll secure boot certificates.
 %package -n     python3-virt-firmware
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-virt-firmware}
-
+Provides:       virt-firmware
 Requires:       python3dist(cryptography)
 Requires:       python3dist(setuptools)
 %description -n python3-virt-firmware
@@ -31,6 +34,14 @@ for edk2 firmware images. They support decoding and printing the content of
 firmware volumes. Variable stores (OVMF_VARS.fd) can be modified, for example
 to enroll secure boot certificates.
 
+%package -n     python3-virt-firmware-tests
+Summary:        %{summary} - test cases
+Requires:       python3-virt-firmware
+Requires:       python3dist(pytest)
+Requires:       edk2-ovmf
+%description -n python3-virt-firmware-tests
+test cases
+
 %prep
 %autosetup -n virt-firmware-v%{pypi_version}
 
@@ -39,6 +50,12 @@ to enroll secure boot certificates.
 
 %install
 %py3_install
+# manpages
+install -m 755 -d      %{buildroot}%{_mandir}/man1
+install -m 644 man/*.1 %{buildroot}%{_mandir}/man1
+# tests
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -ar tests %{buildroot}%{_datadir}/%{name}
 
 %files -n python3-virt-firmware
 %license LICENSE
@@ -47,16 +64,22 @@ to enroll secure boot certificates.
 %{_bindir}/virt-fw-dump
 %{_bindir}/virt-fw-vars
 %{_bindir}/virt-fw-sigdb
-%{_bindir}/pe-dumpinfo
-%{_bindir}/pe-listsigs
-%{_bindir}/pe-addsigs
-%{python3_sitelib}/virt
+%{_bindir}/migrate-vars
+%{_mandir}/man1/virt-*.1*
 %{python3_sitelib}/virt/firmware
-%{python3_sitelib}/virt/firmware/efi
-%{python3_sitelib}/virt/firmware/varstore
 %{python3_sitelib}/virt_firmware-%{pypi_version}-py%{python3_version}.egg-info
 
+%files -n python3-virt-firmware-tests
+%{_datadir}/%{name}/tests
+
 %changelog
+* Mon Nov 14 2022 Gerd Hoffmann <kraxel@redhat.com> - 1.6-1
+- update to version 1.6
+- drop peutils
+- add man-pages
+- add tests sub-package
+- resolves: rhbz#2142608
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index fec2c84..d851a50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virt-firmware-v1.2.tar.gz) = 946aad49cc64369d6bfda9cf7614d47f2c5b87832cf223b5336dfafccc0f6361df4f4abd73f68bf53519ab3be782b39671b44d23ad87e2b837d3f3ac1effa473
+SHA512 (virt-firmware-v1.6.tar.gz) = bcd57ceba993f1fa34d28591a88dcb1a29196dc83a4acf3c749da5c0bd3cf169e8d4d5b2a78dd87fb1e2983f7e2e046565a3d42e2480791cb62a55022facbd2c