diff --git a/389-ds-base.spec b/389-ds-base.spec
index 664a234..db600bb 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -8,8 +8,6 @@
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 #% global relprefix 0.
 
-%global use_openldap 1
-%global use_db4 0
 # If perl-Socket-2.000 or newer is available, set 0 to use_Socket6.
 %global use_Socket6 0
 %global use_nunc_stans 1
@@ -30,7 +28,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.3.6.7
+Version:          1.3.6.8
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+
 URL:              http://www.port389.org
@@ -45,16 +43,8 @@ BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    perl-generators
 BuildRequires:    svrcore-devel >= 4.1.3
-%if %{use_openldap}
 BuildRequires:    openldap-devel
-%else
-BuildRequires:    mozldap-devel
-%endif
-%if %{use_db4}
-BuildRequires:    db4-devel
-%else
 BuildRequires:    libdb-devel
-%endif
 BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
@@ -99,11 +89,8 @@ Requires:         /usr/sbin/semanage
 Requires:         libsemanage-python
 
 # the following are needed for some of our scripts
-%if %{use_openldap}
 Requires:         openldap-clients
-%else
-Requires:         mozldap-tools
-%endif
+
 # use_openldap assumes perl-Mozilla-LDAP is built with openldap support
 Requires:         perl-Mozilla-LDAP
 
@@ -117,11 +104,7 @@ Requires:         cyrus-sasl-gssapi
 Requires:         cyrus-sasl-md5
 
 # this is needed for verify-db.pl
-%if %{use_db4}
-Requires:         db4-utils
-%else
 Requires:         libdb-utils
-%endif
 
 # This picks up libperl.so as a Requires, so we add this versioned one
 Requires:         perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -163,16 +146,8 @@ Group:            System Environment/Daemons
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
 BuildRequires:    svrcore-devel >= 4.1.3
-%if %{use_openldap}
 BuildRequires:    openldap-devel
-%else
-BuildRequires:    mozldap-devel
-%endif
-%if %{use_db4}
-BuildRequires:    db4-devel
-%else
 BuildRequires:    libdb-devel
-%endif
 BuildRequires:    cyrus-sasl-devel
 BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
@@ -197,11 +172,7 @@ Requires:         pkgconfig
 Requires:         nspr-devel
 Requires:         nss-devel
 Requires:         svrcore-devel >= 4.1.3
-%if %{use_openldap}
 Requires:         openldap-devel
-%else
-Requires:         mozldap-devel
-%endif
 %if %{use_nunc_stans}
 Requires:         libtalloc
 Requires:         libevent
@@ -244,9 +215,7 @@ sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!%{__python3}|' ldap/admin/src/scripts/*
 
 %build
 
-%if %{use_openldap}
 OPENLDAP_FLAG="--with-openldap"
-%endif
 %{?with_tmpfiles_d: TMPFILES_FLAG="--with-tmpfiles-d=%{with_tmpfiles_d}"}
 # hack hack hack https://bugzilla.redhat.com/show_bug.cgi?id=833529
 NSSARGS="--with-svrcore-inc=%{_includedir} --with-svrcore-lib=%{_libdir} --with-nss-lib=%{_libdir} --with-nss-inc=%{_includedir}/nss3"
@@ -469,6 +438,10 @@ fi
 %{python3_sitelib}/*
 
 %changelog
+* 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
+
 * Mon Aug 14 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.6.7-1
 - Bump version to 1.3.6.7-1
 - Ticket 49330 - Improve ndn cache performance 1.3.6