diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index fa7fd543f..25ffb6300 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -461,8 +461,13 @@ if ! make DESTDIR="$RPM_BUILD_ROOT" check; then cat ./test-suite.log && false; f
 rm -rf $RPM_BUILD_ROOT
 
 %post
-output=/dev/null
-output2=/dev/null
+if [ -n "$DEBUGPOSTTRANS" ] ; then
+    output=$DEBUGPOSTTRANS
+    output2=${DEBUGPOSTTRANS}.upgrade
+else
+    output=/dev/null
+    output2=/dev/null
+fi
 # reload to pick up any changes to systemd files
 /bin/systemctl daemon-reload >$output 2>&1 || :
 # reload to pick up any shared lib changes
@@ -470,10 +475,6 @@ output2=/dev/null
 # find all instances
 instances="" # instances that require a restart after upgrade
 ninst=0 # number of instances found in total
-if [ -n "$DEBUGPOSTTRANS" ] ; then
-   output=$DEBUGPOSTTRANS
-   output2=${DEBUGPOSTTRANS}.upgrade
-fi
 
 # https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Soft_static_allocation
 # Soft static allocation for UID and GID
@@ -521,6 +522,15 @@ fi
 
 %if %{use_perl}
 # START UPGRADE SCRIPT
+
+if [ -n "$DEBUGPOSTTRANS" ] ; then
+    output=$DEBUGPOSTTRANS
+    output2=${DEBUGPOSTTRANS}.upgrade
+else
+    output=/dev/null
+    output2=/dev/null
+fi
+
 echo looking for instances in %{_sysconfdir}/%{pkgname} > $output 2>&1 || :
 instbase="%{_sysconfdir}/%{pkgname}"
 for dir in $instbase/slapd-* ; do
@@ -589,6 +599,7 @@ exit 0
 %{_datadir}/%{pkgname}
 %exclude %{_datadir}/%{pkgname}/script-templates
 %exclude %{_datadir}/%{pkgname}/updates
+%exclude %{_datadir}/%{pkgname}/properties/*.res
 %{_datadir}/gdb/auto-load/*
 %{_unitdir}
 %{_bindir}/dbscan
@@ -700,8 +711,6 @@ exit 0
 %files legacy-tools
 %defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel
-%{_datadir}/%{pkgname}/script-templates
-%{_datadir}/%{pkgname}/updates
 %{_bindir}/infadd
 %{_mandir}/man1/infadd.1.gz
 %{_bindir}/ldif
@@ -728,6 +737,9 @@ exit 0
 %{_sbindir}/upgradednformat
 %{_mandir}/man8/upgradednformat.8.gz
 %if %{use_perl}
+%{_datadir}/%{pkgname}/properties/*.res
+%{_datadir}/%{pkgname}/script-templates
+%{_datadir}/%{pkgname}/updates
 %{_mandir}/man1/dbgen.pl.1.gz
 %{_bindir}/repl-monitor
 %{_mandir}/man1/repl-monitor.1.gz