diff --git a/.gitignore b/.gitignore
index 3485007..79df0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -155,3 +155,4 @@
 /389-ds-base-1.4.0.2.tar.bz2
 /389-ds-base-1.4.0.3.tar.bz2
 /389-ds-base-1.4.0.4.tar.bz2
+/389-ds-base-1.4.0.5.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index ea260a8..28a7929 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -1,6 +1,13 @@
 
 %global pkgname   dirsrv
 %global srcname   389-ds-base
+
+# Exclude 32 bit arches
+ExcludeArch: i386
+ExcludeArch: i686
+ExcludeArch: s390
+ExcludeArch: ppc
+
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
 # also remove the space between % and global - this space is needed because
 # fedpkg verrel stupidly ignores comment lines
@@ -40,7 +47,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.4.0.4
+Version:          1.4.0.5
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+
 URL:              http://www.port389.org
@@ -61,8 +68,8 @@ BuildRequires:    cyrus-sasl-devel
 BuildRequires:    icu
 BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
-BuildRequires:    libatomic
 %if %{use_clang}
+BuildRequires:    libatomic
 BuildRequires:    clang
 %else
 BuildRequires:    gcc
@@ -179,7 +186,7 @@ Please see http://seclists.org/oss-sec/2016/q1/363 for more information.
 Summary:          Core libraries for 389 Directory Server
 Group:            System Environment/Daemons
 BuildRequires:    nspr-devel
-BuildRequires:    nss-devel >= 3.24
+BuildRequires:    nss-devel >= 3.34
 BuildRequires:    svrcore-devel >= 4.1.3
 BuildRequires:    openldap-devel
 BuildRequires:    libdb-devel
@@ -285,6 +292,12 @@ RUST_FLAGS="--enable-rust"
 PERL_FLAGS="--disable-perl"
 %endif
 
+%if %{use_clang}
+export CC=clang
+export CXX=clang++
+CLANG_FLAGS="--enable-clang"
+%endif
+
 # Rebuild the autotool artifacts now.
 autoreconf -fiv
 
@@ -294,11 +307,10 @@ autoreconf -fiv
            --with-perldir=/usr/bin \
            --with-pythonexec=%{__python3} \
            --with-systemdgroupname=%{groupname} $NSSARGS $ASAN_FLAGS \
-           --with-systemd $TCMALLOC_FLAGS $RUST_FLAGS $PERL_FLAGS \
+           --with-systemd $TCMALLOC_FLAGS $RUST_FLAGS $PERL_FLAGS $CLANG_FLAGS \
            --enable-cmocka 
 
 
-%if 0%{?rhel} >= 8 || 0%{?fedora}
 make setup.py
 
 # lib389
@@ -308,7 +320,6 @@ popd
 
 # tests
 %py3_build
-%endif
 
 # Generate symbolic info for debuggers
 export XCFLAGS=$RPM_OPT_FLAGS
@@ -323,7 +334,6 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_sbindir}
 # Copy in our docs from doxygen.
 cp -r %{_builddir}/%{name}-%{version}%{?prerel}/man/man3 $RPM_BUILD_ROOT/%{_mandir}/man3
 
-%if 0%{?rhel} >= 8 || 0%{?fedora}
 # lib389
 pushd src/lib389
 %py3_install
@@ -331,7 +341,6 @@ popd
 
 # tests
 %py3_install
-%endif
 
 mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname}
 mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkgname}
@@ -576,7 +585,6 @@ fi
 %{_mandir}/man1/ldap-agent.1.gz
 %{_unitdir}/%{pkgname}-snmp.service
 
-%if 0%{?rhel} >= 8 || 0%{?fedora}
 %files -n python%{python3_pkgversion}-lib389
 %defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+
@@ -585,16 +593,25 @@ fi
 %{_sbindir}/dsctl
 %{_sbindir}/dsidm
 %{python3_sitelib}/lib389*
-%endif
 
-%if 0%{?rhel} >= 8 || 0%{?fedora}
 %files -n python%{python3_pkgversion}-%{srcname}-tests
 %defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+
 %{python3_sitelib}/dirsrvtests*
-%endif
 
 %changelog
+* Wed Jan 31 2018 Mark REynolds <mreynolds@redhat.com> - 1.4.0.5-1
+- Bump version to 1.4.0.5
+- CVE-2017-15134 389-ds-base: Remote DoS via search filters in slapi_filter_sprintf
+- Ticket 49546 - Fix broken snmp MIB file
+- Ticket 49554 - update readme
+- Ticket 49554 - Update Makefile for README.md
+- Ticket 49400 - Make CLANG configurable
+- Ticket 49530 - Add pseudolocalization option for dbgen
+- Ticket 49523 - Fixed skipif marker, topology fixture and log message
+- Ticket 49544 - Double check pw prompts
+- Ticket 49548 - Cockpit UI - installer should also setup Cockpit
+
 * Fri Jan 26 2018 Mark Reynolds <mreynolds@redhat.com> - 1.4.0.4-1
 - Bump version to 1.4.0.4
 - Ticket 49540 - Indexing task is reported finished too early regarding the backend status
diff --git a/sources b/sources
index 51550a5..8debb06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (389-ds-base-1.4.0.4.tar.bz2) = 0c8c5c21e8dc66e636275e1dca0a4f3c1ab7528f636a081eb6a0b8ff0750d68841a87ebc322e4bb2d57aeafad5281b441ca45c5cbab5d1d7ea6ae61a4e583334
+SHA512 (389-ds-base-1.4.0.5.tar.bz2) = a3ef4ab5d0a879a73c04d4d0dce1efbff897a1190c2ac246b0c52c8110a75846c495051ea46c1a5f7632fdeee7ce2704a9e9f40585c8b35f21818acdb40b7549