Index: server/fedora/Makefile
===================================================================
--- server/fedora/Makefile	(revision 786)
+++ server/fedora/Makefile	(revision 788)
@@ -19,6 +19,6 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream	= openafs krb5 httpd mit-zephyr openssh
-oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd
+upstream	= openafs krb5 httpd openssh
+oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr 
 allsrc		= $(upstream) $(oursrc)
 oursrcdir	= ${PWD}/../common/oursrc
@@ -133,5 +133,5 @@
 openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
 
-suexec: install-srpms
+suexec: #install-srpms
 	@rm -rf ${tmp_src}/httpd-2*/; \
 	tar zxvf ${tmp_src}/httpd-2*.tar.gz; \
@@ -165,6 +165,6 @@
 krb5-deps	= bison ncurses-devel texinfo keyutils-libs-devel
 openafs-deps	= pam-devel automake
-mit-zephyr-deps	= readline-devel hesiod.i386 libXt.i386 #compat-readline43
-openssh-deps	= gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth gobject-devel pango-devel cairo-devel libedit-devel
+mit-zephyr-deps	= readline-devel hesiod-devel hesiod-devel.i386 hesiod.i386 libXt.i386 #compat-readline43
+openssh-deps	= gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth gobject-devel pango-devel cairo-devel libedit-devel nss-devel
 install-deps:
 	yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps)