Index: trunk/server/fedora/Makefile
===================================================================
--- trunk/server/fedora/Makefile	(revision 2759)
+++ trunk/server/fedora/Makefile	(revision 2761)
@@ -19,5 +19,5 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i686 httpd openssh libgsasl openssl openssl.i686
+upstream_yum	= krb5 krb5.i686 httpd openssh libgsasl openssl openssl.i686 389-ds-base
 hackage		= cgi-3001.1.8.5 unix-handle-0.0.0
 upstream_hackage = ghc-cgi ghc-unix-handle
@@ -25,5 +25,5 @@
 upstream_gems	= rubygem-pony rubygem-fcgi
 upstream_eggs   = python-authkit
-upstream	= openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) $(upstream_eggs) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss
+upstream	= openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) $(upstream_eggs) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss 
 oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs scripts-munin-plugins
 allsrc		= $(upstream) $(oursrc)
Index: trunk/server/fedora/specs/389-ds-base.spec.patch
===================================================================
--- trunk/server/fedora/specs/389-ds-base.spec.patch	(revision 2761)
+++ trunk/server/fedora/specs/389-ds-base.spec.patch	(revision 2761)
@@ -0,0 +1,39 @@
+--- 389-ds-base.spec.orig	2016-02-27 22:35:25.978791486 -0500
++++ 389-ds-base.spec	2016-02-27 22:39:49.112790989 -0500
+@@ -25,7 +25,7 @@
+ Summary:          389 Directory Server (base)
+ Name:             389-ds-base
+ Version:          1.3.2.23
+-Release:          %{?relprefix}1%{?prerel}%{?dist}
++Release:          %{?relprefix}1%{?prerel}%{?dist}.scripts.%{scriptsversion}
+ License:          GPLv2 with exceptions
+ URL:              http://port389.org/
+ Group:            System Environment/Daemons
+@@ -115,6 +115,8 @@
+ Source1:          %{name}-git.sh
+ Source2:          %{name}-devel.README
+ 
++Patch1000:        389-ds-indirect-cos.patch
++
+ %description
+ 389 Directory Server is an LDAPv3 compliant server.  The base package includes
+ the LDAP server and command line utilities for server administration.
+@@ -165,6 +167,9 @@
+ %setup -q -n %{name}-%{version}%{?prerel}
+ cp %{SOURCE2} README.devel
+ 
++%define _default_patch_fuzz 2
++%patch1000 -p1 -b .cos
++
+ %build
+ %if %{use_openldap}
+ OPENLDAP_FLAG="--with-openldap"
+@@ -176,7 +181,7 @@
+            --with-systemdsystemunitdir=%{_unitdir} \
+            --with-systemdsystemconfdir=%{_sysconfdir}/systemd/system \
+            --with-perldir=/usr/bin \
+-           --with-systemdgroupname=%{groupname} $NSSARGS
++           --with-systemdgroupname=% {groupname} $NSSARGS
+ 
+ # Generate symbolic info for debuggers
+ export XCFLAGS=$RPM_OPT_FLAGS