diff --git a/postfix.changes b/postfix.changes
index 07cdfb1..d972ac5 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  5 01:44:30 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
+
+- Move qshape(1) out of -doc, install it as a binary with the main package
+
 -------------------------------------------------------------------
 Tue Mar  5 16:46:16 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/postfix.spec b/postfix.spec
index 40ecdb0..bb93768 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -368,6 +368,9 @@ cp -a examples/* %{buildroot}%{pf_sample_directory}
 cp -a html/*     %{buildroot}%{pf_html_directory}
 cp -a auxiliary %{buildroot}%{pf_docdir}
 rm %{buildroot}%{pf_docdir}/README_FILES/INSTALL
+rm -r %{buildroot}%{pf_docdir}/auxiliary/qshape
+install -p auxiliary/qshape/qshape.pl %{buildroot}%{_sbindir}/qshape
+mantools/srctoman - auxiliary/qshape/qshape.pl > %{buildroot}%{_mandir}/man1/qshape.1
 # Fix build for Leap 42.3.
 rm -f %{buildroot}%{_sysconfdir}/%{name}/*.orig
 mkdir -p %{buildroot}%{_unitdir}/mail-transfer-agent.target.wants/
@@ -538,6 +541,7 @@ fi
 %attr(0755,root,root) %{_sbindir}/postmap
 %attr(0755,root,root) %{_sbindir}/postmulti
 %attr(0755,root,root) %{_sbindir}/postsuper
+%attr(0755,root,root) %{_sbindir}/qshape
 %attr(0755,root,root) %{_sbindir}/qmqp-source
 %attr(0755,root,root) %{_sbindir}/smtp-sink
 %attr(0755,root,root) %{_sbindir}/smtp-source