diff --git a/.gitignore b/.gitignore
index 419fd1f..e3c48f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,4 @@
 /389-ds-base-1.3.6.1.tar.bz2
 /389-ds-base-1.3.6.2.tar.bz2
 /389-ds-base-1.3.6.3.tar.bz2
+/389-ds-base-1.3.6.4.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 35f78b4..df179dd 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -30,8 +30,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.3.6.3
-Release:          %{?relprefix}4%{?prerel}%{?dist}
+Version:          1.3.6.4
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+
 URL:              http://www.port389.org
 Group:            System Environment/Daemons
@@ -319,24 +319,21 @@ if [ -n "$DEBUGPOSTTRANS" ] ; then
    output=$DEBUGPOSTTRANS
 fi
 
-has_dirsrv=`/usr/bin/grep -Ei "^dirsrv\>" /etc/passwd` || :
-if [ "$has_dirsrv" = "" ]; then
-  dirsrv_uid=389
-  while [ "`getent passwd | awk -F: '{print $3}' | grep $dirsrv_uid`" != "" ]; do
-    dirsrv_uid=`expr $dirsrv_uid + 1`
-  done
-  echo "User dirsrv does not exist, create it with uid %dirsrv_uid." >> $output 2>&1 || :
-  /usr/sbin/useradd -c "389-ds-base" -u $dirsrv_uid \
-    -s /sbin/nologin -r -d /usr/share/dirsrv dirsrv 2> /dev/null || :
-fi
-has_dirsrv=`/usr/bin/grep -iE "^dirsrv\>" /etc/group` || :
-if [ "$has_dirsrv" = "" ]; then
-  dirsrv_gid=389
-  while [ "`getent group | grep $dirsrv_gid`" != "" ]; do
-    dirsrv_gid=`expr $dirsrv_gid + 1`
-  done
-  echo "Group dirsrv does not exist, create it with uid %dirsrv_gid." >> $output 2>&1 || :
-  /usr/sbin/groupadd -g $dirsrv_gid -r dirsrv 2> /dev/null || :
+# https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Soft_static_allocation
+# Soft static allocation for UID and GID
+USERNAME="dirsrv"
+ALLOCATED_UID=389
+GROUPNAME="dirsrv"
+ALLOCATED_GID=389
+HOMEDIR="/usr/share/dirsrv"
+
+getent group $GROUPNAME >/dev/null || /usr/sbin/groupadd -f -g $ALLOCATED_GID -r $GROUPNAME
+if ! getent passwd $USERNAME >/dev/null ; then
+    if ! getent passwd $ALLOCATED_UID >/dev/null ; then
+      /usr/sbin/useradd -r -u $ALLOCATED_UID -g $GROUPNAME -d $HOMEDIR -s /sbin/nologin -c "user for 389-ds-base" $USERNAME
+    else
+      /usr/sbin/useradd -r -g $GROUPNAME -d $HOMEDIR -s /sbin/nologin -c "user for 389-ds-base" $USERNAME
+    fi
 fi
 
 echo looking for services in %{_sysconfdir}/systemd/system/%{groupname}.wants/* >> $output 2>&1 || :
@@ -467,6 +464,54 @@ fi
 %{python3_sitelib}/*
 
 %changelog
+* Fri Apr 21 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.6.4-1
+- Bump version to 1.3.6.4-1
+- Ticket 49228 - Fix SSE4.2 detection.
+- Ticket 49229 - Correct issues in latest commits
+- Ticket 49226 - Memory leak in ldap-agent-bin
+- Ticket 49214 - Implement htree concept
+- Ticket 49119 - Cleanup configure.ac options and defines
+- Ticket 49097 - whitespace fixes for pblock change
+- Ticket 49097 - Pblock get/set cleanup
+- Ticket 49222 - Resolve various test issues on rawhide
+- Issue 48978 - Fix the emergency logging functions severity levels
+- Issue 49227 - ldapsearch for nsslapd-errorlog-level returns  incorrect values
+- Ticket 49041 - nss won't start if sql db type set
+- Ticket 49223 - Fix sds queue locking
+- Issue 49204 - Fix 32bit arch build failures
+- Issue 49204 - Need to update function declaration
+- Ticket 49204 - Fix lower bounds on import autosize + On small VM, autotune breaks the access of the suffixes
+- Issue 49221 - During an upgrade the provided localhost name is ignored
+- Issue 49220 - Remote crash via crafted LDAP messages (SECURITY FIX)
+- Ticket 49184 - Overflow in memberof
+- Ticket 48050 - Add account policy tests to plugins test suite
+- Ticket 49207 - Supply docker POC build for DS.
+- Issue 47662 - CLI args get removed
+- Issue 49210 - Fix regression when checking is password min  age should be checked
+- Ticket 48864 - Add cgroup memory limit detection to 389-ds
+- Issue 48085 - Expand the repl acceptance test suite
+- Ticket 49209 - Hang due to omitted replica lock release
+- Ticket 48864 - Cleanup memory detection before we add cgroup support
+- Ticket 48864 - Cleanup up broken format macros and imports
+- Ticket 49153 - Remove vacuum lock on transaction cleanup
+- Ticket 49200 - provide minimal dse.ldif for python installer
+- Issue 49205 - Fix logconv.pl man page
+- Issue 49177 - Fix pkg-config file
+- Issue 49035 - dbmon.sh shows pages-in-use that exceeds the cache size
+- Ticket 48432 - Linux capabilities on ns-slapd
+- Ticket 49196 - Autotune generates crit messages
+- Ticket 49194 - Lower default ioblock timeout
+- Ticket 49193 - gcc7 warning fixes
+- Issue 49039 - password min age should be ignored if password needs to be reset
+- Ticket 48989 - Re-implement lock counter
+- Issue 49192 - Deleting suffix can hang server
+- Issue 49156 - Modify token :assert: to :expectedresults:
+- Ticket 48989 - missing return in counter
+- Ticket 48989 - Improve counter overflow fix
+- Ticket 49190 - Upgrade lfds to 7.1.1
+- Ticket 49187 - Fix attribute definition
+- Ticket 49185 - Fix memleak in compute init
+
 * Wed Mar 22 2017 Mark Reynolds <mreynolds@redhat.com> - 1.3.6.3-4
 - Bump verson to 1.3.6.3-4
 - Issue 49177 - rpm would not create valid pkgconfig files(pt2)
diff --git a/sources b/sources
index 69d384f..39f3b64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (389-ds-base-1.3.6.3.tar.bz2) = d01bdd36e9f297221316341c7e0714b514ae8121708a5b2d088127a1b2c327451ff182713561ee3639753984a33418aae33ddefd40178d7f61deefb16797d1e7
+SHA512 (389-ds-base-1.3.6.4.tar.bz2) = e370270391d9e4bac4eb969380f76fbc715886a8f0b156433fee932d2701fbedd8f0460369a2878dd8f134ac5f35393ea2ea76b25cb24e91b744c1de2af3d879