diff --git a/VERSION.sh b/VERSION.sh
index 6cfd8636c..365018bc8 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=4
-VERSION_MAINT=0.9
+VERSION_MAINT=0.10
 # NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
 VERSION_PREREL=
 VERSION_DATE=$(date -u +%Y%m%d)
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 3f1dfe9a6..fa7fd543f 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -63,7 +63,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:        %{name}-selinux
 Conflicts:        selinux-policy-base < 3.9.8
 # upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp
-Obsoletes:        %{name} <= 1.3.5.4
+Obsoletes:        %{name} <= 1.4.0.9
 Provides:         ldif2ldbm
 
 # Attach the buildrequires to the top level package:
@@ -219,7 +219,8 @@ package to be installed with just the -libs package and without the main package
 %package          legacy-tools
 Summary:          Legacy utilities for 389 Directory Server (%{variant})
 Group:            System Environment/Daemons
-Requires:         %{name}= %{version}-%{release}
+Obsoletes:        %{name} <= 1.4.0.9
+Requires:         %{name} = %{version}-%{release}
 %if %{use_perl}
 # for setup-ds.pl to support ipv6
 %if %{use_Socket6}
@@ -586,10 +587,10 @@ exit 0
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}.systemd
 %{_datadir}/%{pkgname}
+%exclude %{_datadir}/%{pkgname}/script-templates
+%exclude %{_datadir}/%{pkgname}/updates
 %{_datadir}/gdb/auto-load/*
 %{_unitdir}
-%{_bindir}/cl-dump
-%{_mandir}/man1/cl-dump.1.gz
 %{_bindir}/dbscan
 %{_mandir}/man1/dbscan.1.gz
 %{_bindir}/ds-replcheck
@@ -606,8 +607,6 @@ exit 0
 %{_mandir}/man1/pwdhash.1.gz
 %{_bindir}/readnsstate
 %{_mandir}/man1/readnsstate.1.gz
-%{_bindir}/repl-monitor
-%{_mandir}/man1/repl-monitor.1.gz
 # We have to seperate this from being a glob to ensure the caps are applied.
 %caps(CAP_NET_BIND_SERVICE=pe) %{_sbindir}/ns-slapd
 %{_mandir}/man8/ns-slapd.8.gz
@@ -701,6 +700,8 @@ 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,7 +729,11 @@ exit 0
 %{_mandir}/man8/upgradednformat.8.gz
 %if %{use_perl}
 %{_mandir}/man1/dbgen.pl.1.gz
+%{_bindir}/repl-monitor
+%{_mandir}/man1/repl-monitor.1.gz
 %{_bindir}/repl-monitor.pl
+%{_bindir}/cl-dump
+%{_mandir}/man1/cl-dump.1.gz
 %{_bindir}/cl-dump.pl
 %{_bindir}/dbgen.pl
 %{_mandir}/man8/bak2db.pl.8.gz