diff --git a/.gitignore b/.gitignore
index 572f7a9..f279a88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,4 @@
 /389-ds-base-1.3.5.16.tar.bz2
 /389-ds-base-1.3.6.3.tar.bz2
 /389-ds-base-1.3.5.17.tar.bz2
+/389-ds-base-1.3.5.18.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 8efe0c8..7b76a66 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -33,7 +33,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.3.5.17
+Version:          1.3.5.18
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+
 URL:              http://www.port389.org/
@@ -454,6 +454,33 @@ fi
 %{_sysconfdir}/%{pkgname}/dirsrvtests
 
 %changelog
+* Wed Jul 12 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.5.18-1
+- Bump version to 1.3.5.18
+- Ticket 49273 - Fix logging from previous patch
+- Ticket 49273 - bak2db doesn't operate with dbversion
+- Ticket 49273 - crash when DBVERSION is corrupt.
+- Ticket 49241 - add symblic link location to db2bak.pl output
+- Ticket 49157 - fix error in ds-logpipe.py
+- Ticket 49246 - ns-slapd crashes in role cache creation
+- Ticket 48989 - Re-implement lock counter
+- Ticket 48989 - missing return in counter
+- Ticket 48989 - Improve counter overflow fix
+- Ticket 49157 - ds-logpipe.py crashes for non-existing users
+- Ticket 49241 - Update man page and usage for db2bak.pl
+- Ticket 49209 - Hang due to omitted replica lock release
+
+* Tue Jun 6 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.5.17-3.1
+- Revise upgrade logic
+
+* Wed Apr 26 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.5.17-3
+- Bump version to 1.3.5.17-3
+- Fix improper backport to specfile
+
+* Mon Apr 24 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.5.17-2
+- Bump version to 1.3.5.17-2
+- Bug 1391728 - %post enumerates groups many times, refers to undefined macros
+
+>>>>>>> af3a865... Bump version to 1.3.5.18
 * Fri Apr 21 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.5.17-1
 - Bump version to 1.3.5.17
 - Issue 49221 - During an upgrade the provided localhost name is ignored
diff --git a/sources b/sources
index 0f7574f..fea68b7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+SHA512 (389-ds-base-1.3.5.18.tar.bz2) = 3a1cc56cd1abda4daad5d38c9a129670d88186b78e5a923eb4de7e8d522c8fa05d5f7d2eebc81ea2bf3d9dd6422ee4859dd93de704bf544b244e535c7ffeae0a
 SHA512 (nunc-stans-0.1.8.tar.bz2) = a32c3526cf977990ea0879e3ea10c413f46d6d60563f886c86d84819553b25a5daecc14af8db5dd2274ec9cebe70da7b3a2db322d489bbd5155407d05dc0422d
-SHA512 (389-ds-base-1.3.5.17.tar.bz2) = 5b96b19cea7dc80c64eaade31127d04c228f7e4dc1999ec19b341cf080ee4570757c84e8dae151c2cb3bcebe1398d50238d74ca362ce07fceafcb66fba590833