diff --git a/crispy-doom.changes b/crispy-doom.changes
index 18fc166..4305982 100644
--- a/crispy-doom.changes
+++ b/crispy-doom.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 29 16:33:13 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Switch from packageand() to modern rpm conditionals
+- Avoid conflict with chocolate-doom manpages
+
 -------------------------------------------------------------------
 Mon Mar 27 14:20:45 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/crispy-doom.spec b/crispy-doom.spec
index c19ed92..bdda63a 100644
--- a/crispy-doom.spec
+++ b/crispy-doom.spec
@@ -48,7 +48,7 @@ based on Chocolate Doom.
 Summary:        Crispy Doom command line completion support for bash
 Group:          System/Shells
 BuildArch:      noarch
-Supplements:    (%name-bash-completion and bash-completion)
+Supplements:    (%name and bash-completion)
 
 %description bash-completion
 Additions for bash-completion to support crispy-doom.
@@ -67,7 +67,10 @@ b="%buildroot"
 	docdir="%_docdir/%name"
 mkdir -p "$b/%_bindir"
 rm -f "$b/%_docdir/%name/INSTALL"
-#rm -f "$b/%_datadir/applications/chocolate-setup.desktop" # has wrong paths
+pushd "$b/%_mandir/man5"
+for i in default heretic hexen; do
+        mv "$i.cfg.5" "crispy-doom-$i.cfg.5"
+done
 %fdupes %buildroot/%_prefix
 
 %post