diff --git a/.gitignore b/.gitignore
index 32f87b8..7540570 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,4 @@
 /389-ds-base-1.3.6.6.tar.bz2
 /389-ds-base-1.3.6.7.tar.bz2
 /389-ds-base-1.3.6.8.tar.bz2
+/389-ds-base-1.3.6.9.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 924e448..efeac50 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -28,7 +28,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.3.6.8
+Version:          1.3.6.9
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+
 URL:              http://www.port389.org
@@ -126,10 +126,10 @@ Requires:         perl-Socket
 %endif
 Requires:         perl-NetAddr-IP
 Requires:         systemd-libs
-Requires:         svrcore >= 4.1.2
+Requires:         svrcore >= 4.1.3
 
 # upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp
-Obsoletes:        %{name} <= 1.3.5.4
+Obsoletes:        %{name} <= 1.3.6.8
 
 Source0:          https://releases.pagure.org/389-ds-base/%{name}-%{version}%{?prerel}.tar.bz2
 # 389-ds-git.sh should be used to generate the source tarball from git
@@ -339,9 +339,9 @@ echo remove pid files . . . >> $output 2>&1 || :
 echo upgrading instances . . . >> $output 2>&1 || :
 DEBUGPOSTSETUPOPT=`/usr/bin/echo $DEBUGPOSTSETUP | /usr/bin/sed -e "s/[^d]//g"`
 if [ -n "$DEBUGPOSTSETUPOPT" ] ; then
-    %{_sbindir}/setup-ds.pl -l $output -$DEBUGPOSTSETUPOPT -u -s General.UpdateMode=offline >> $output 2>&1 || :
+    %{_sbindir}/setup-ds.pl -$DEBUGPOSTSETUPOPT -u -s General.UpdateMode=offline >> $output 2>&1 || :
 else
-    %{_sbindir}/setup-ds.pl -l $output -u -s General.UpdateMode=offline >> $output 2>&1 || :
+    %{_sbindir}/setup-ds.pl -u -s General.UpdateMode=offline >> $output 2>&1 || :
 fi
 
 # restart instances that require it
@@ -438,6 +438,19 @@ fi
 %{python3_sitelib}/*
 
 %changelog
+* Mon Oct 9 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.6.9-1
+- Bump version to 1.3.6.9
+- Ticket 49392 - memavailable not available
+- Ticket 49389 - unable to retrieve specific cosAttribute when subtree password policy is configured
+- Ticket 49180 - backport 1.3.6 errors log filled with attrlist_replace - attr_replace
+- Ticket 49379 - Allowed sasl mapping requires restart
+- Ticket 49327 - password expired control not sent during grace logins
+- Ticket 49380 - Add CI test
+- Ticket 49380 - Crash when adding invalid replication  agreement
+- Ticket 49370 - local password policies should use the same defaults as the global policy
+- Ticket 49364 - incorrect function declaration.
+- Ticket 49368 - Fix typo in log message
+
 * Tue Aug 22 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.6.8-1
 - Bump version to 1.3.6.8
 - Ticket 49356 - mapping tree crash can occur during tot init
diff --git a/sources b/sources
index e7ce6f4..15babab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (389-ds-base-1.3.6.8.tar.bz2) = b08a87bffbdf8e4c6bf6b4f87394aa0a12b8b44fcadec2f97c146b3a21ff89f5f547080aacb0ecda9b91aca83f8bf093b64c2569b2d8be84ffe22439be446234
+SHA512 (389-ds-base-1.3.6.9.tar.bz2) = df960bef61ed0d221f0c84b6f6a9dcb899b529a2366229631403edda80a6180f50ddb09892071e6229406fe851c272fea248370c3b18f6962b7a9b1df8c1f440