diff -urN heimdal.orig/files/heimdal-kadmind heimdal/files/heimdal-kadmind
--- heimdal.orig/files/heimdal-kadmind	1970-01-01 01:00:00.000000000 +0100
+++ heimdal/files/heimdal-kadmind	2004-06-19 15:38:09.000000000 +0200
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+	use heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting heimdal kadmind"
+	start-stop-daemon --start --quiet --exec \
+		/usr/libexec/kadmind &
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heimdal kadmind"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/libexec/kadmind
+	eend $?
+}
diff -urN heimdal.orig/files/heimdal-kdc heimdal/files/heimdal-kdc
--- heimdal.orig/files/heimdal-kdc	1970-01-01 01:00:00.000000000 +0100
+++ heimdal/files/heimdal-kdc	2004-06-19 15:38:24.000000000 +0200
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+	after logger
+}
+
+start() {
+	ebegin "Starting heimdal kdc"
+	start-stop-daemon --start --quiet --exec \
+		/usr/libexec/kdc -- --detach
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heimdal kdc"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/libexec/kdc
+	eend $?
+}
diff -urN heimdal.orig/files/heimdal-kpasswdd heimdal/files/heimdal-kpasswdd
--- heimdal.orig/files/heimdal-kpasswdd	1970-01-01 01:00:00.000000000 +0100
+++ heimdal/files/heimdal-kpasswdd	2004-06-19 15:38:43.000000000 +0200
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+	use heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting heimdal kpasswdd"
+	start-stop-daemon --start --quiet --exec \
+		/usr/libexec/kpasswdd &
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping heimdal kpasswdd"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/libexec/kpasswdd
+	eend $?
+}
diff -urN heimdal.orig/heimdal-0.6.2.ebuild heimdal/heimdal-0.6.2.ebuild
--- heimdal.orig/heimdal-0.6.2.ebuild	2004-06-14 20:06:11.000000000 +0200
+++ heimdal/heimdal-0.6.2.ebuild	2004-06-19 15:47:05.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.2.ebuild,v 1.10 2004/06/14 17:36:17 aliz Exp $
+# $Header: $
 
 inherit libtool eutils
 
@@ -101,4 +101,17 @@
 		mv ${D}/usr/share/man/man1/${i}.1.gz ${D}/usr/share/man/man1/k${i}.1.gz
 		mv ${D}/usr/bin/${i} ${D}/usr/bin/k${i}
 	done
+
+	# Create symlinks for the includes
+	cd ${D}/usr/include/ && \
+		ln -s heimdal gssapi && \
+		ln -s heimdal/krb5-types.h krb5-types.h \
+	|| die "Creation of include symlinks failed."
+
+	dodir /etc/init.d
+	exeinto /etc/init.d
+
+	doexe ${FILESDIR}/heimdal-kdc \
+		${FILESDIR}/heimdal-kadmind \
+		${FILESDIR}/heimdal-kpasswdd
 }
diff -urN heimdal.orig/Manifest heimdal/Manifest
--- heimdal.orig/Manifest	2004-06-14 20:06:11.000000000 +0200
+++ heimdal/Manifest	2004-06-19 15:57:35.000000000 +0200
@@ -1,10 +1,13 @@
-MD5 a737246dfbeb4735095940d50bc2b5aa ChangeLog 5836
+MD5 ddd8e3d9ef172f80a93e10f4ba89af1c heimdal-0.6.2.ebuild 3036
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
-MD5 81c334524fea328bea1d2739ffef2a34 heimdal-0.6.2.ebuild 2814
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
+MD5 a737246dfbeb4735095940d50bc2b5aa ChangeLog 5836
+MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
 MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 be33a56b8c32d8580ff260b2a8588f95 files/heimdal-kpasswdd 453
 MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
-MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
+MD5 ccbb78f661c2d1aa87c4a87b5e23f034 files/heimdal-kadmind 449
+MD5 4343f31f0015b20de280151a8989b1c4 files/heimdal-kdc 426
+MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
 MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
 MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125