diff --git a/krb5-1.6-nodeplibs.patch b/krb5-1.6-nodeplibs.patch
index a6b2033..eeb7642 100644
--- a/krb5-1.6-nodeplibs.patch
+++ b/krb5-1.6-nodeplibs.patch
@@ -8,7 +8,7 @@ way or another by the --deps flag in future upstream releases.
      fi
  
      if test $library = 'krb5'; then
--	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
+-	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $SELINUX_LIBS $DL_LIB"
 +	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
      fi
  
diff --git a/krb5.spec b/krb5.spec
index dd5a75d..8075477 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -14,7 +14,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.1
-Release: 2
+Release: 3
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -86,6 +86,7 @@ Patch57: krb5-1.6.1-ftp-nospew.patch
 Patch60: krb5-1.6.1-pam.patch
 Patch61: krb5-trunk-manpaths.patch
 Patch62: krb5-any-fixup-patch.txt
+Patch63: krb5-1.6.1-selinux-label.patch
 
 License: MIT, freely distributable.
 URL: http://web.mit.edu/kerberos/www/
@@ -96,6 +97,7 @@ BuildPrereq: autoconf, bison, e2fsprogs-devel >= 1.35, flex
 BuildPrereq: gzip, ncurses-devel, rsh, texinfo, tar
 BuildRequires: tetex-latex
 BuildRequires: keyutils-libs-devel
+BuildRequires: libselinux-devel
 
 %if %{WITH_LDAP}
 BuildRequires: openldap-devel
@@ -110,6 +112,7 @@ practice of cleartext passwords.
 Summary: Development files needed to compile Kerberos 5 programs.
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}, e2fsprogs-devel
+Requires: keyutils-libs-devel, libselinux-devel
 
 %description devel
 Kerberos is a network authentication system. The krb5-devel package
@@ -199,6 +202,9 @@ installed on systems which are meant provide these services.
 %endif
 
 %changelog
+* Sun Jun 24 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6.1-3
+- label all files at creation-time according to the SELinux policy (#228157)
+
 * Fri Jun 22 2007 Nalin Dahyabhai <nalin@redhat.com>
 - perform PAM account / session management in krshd (#182195,#195922)
 - perform PAM authentication and account / session management in ftpd
@@ -1108,12 +1114,13 @@ installed on systems which are meant provide these services.
 %prep
 %setup -q -a 23
 pushd src
-# %patch60 -p2 -b .pam
+%patch60 -p2 -b .pam
 %patch61 -p0 -b .manpaths
 popd
 pushd src/lib/krb5/keytab
 %patch62 -p0 -b .any-fixup
 popd
+%patch63 -p1 -b .selinux-label
 %patch3  -p1 -b .netkit-rsh
 %patch4  -p1 -b .rlogind-environ
 %patch5  -p1 -b .ksu-access