diff --git a/security/heimdal/parse-config.disabled b/security/heimdal/parse-config.disabled
new file mode 100644
index 000000000..bfbf86fbb
--- /dev/null
+++ b/security/heimdal/parse-config.disabled
@@ -0,0 +1,84 @@
+#!/bin/sh
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../heimdal/parse-config.disabled
+# Copyright (C) 2006 - 2013 The OpenSDE Project
+# Copyright (C) 2004 - 2006 The T2 SDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+if pkginstalled -f heimdal; then
+
+	pkgprefix -t heimdal
+	KRB5PREFIX=$root/$( pkgprefix heimdal )
+	KRB5INC=$root$( pkgprefix includedir heimdal )
+	KRB5LIB=$root$( pkgprefix libdir heimdal )
+
+	# Set up an environment variable to point to the package
+	# config file.
+	KRB5_CONFIG=$root$( pkgprefix bindir heimdal )/krb5-config
+	export KRB5_CONFIG
+
+	# config tweaks
+	case "$pkg" in
+		postgresql)
+			# packages 'sensitive' to the massive enabling
+			var_append extraconfopt " " "--with-krb5"	;;
+		dovecot)
+			var_append extraconfopt " " "--with-gssapi"	;;
+		*)	# massive enabling of heimdal support
+
+			# prefix-less
+			var_append extraconfopt " " "--with-kerberos"	#This usually supports 4 only
+			#var_append extraconfopt " " "--with-krb4"	#4 Only and not recommended
+			var_append extraconfopt " " "--with-gss"	#From mutt
+
+			# prefix-based
+			var_append extraconfopt " " "--with-krb5${KRB5PREFIX:+=$KRB5PREFIX}"		#From nfs-utils
+			var_append extraconfopt " " "--with-kerberos5${KRB5PREFIX:+=$KRB5PREFIX}"	#From openssh and fetchmail
+			var_append extraconfopt " " "--enable-gssapi${KRB5PREFIX:+=$KRB5PREFIX}"	#From cyrus-sasl2
+
+			var_append extraconfopt " " "--with-krb5-includes${KRB5INC:+=$KRB5INC}" 	#From evolution-data-server
+			var_append extraconfopt " " "--with-krb5-libs${KRB5LIB:+=$KRB5LIB}"		#From evolution-data-server
+
+			var_append extraconfopt " " "--with-gssapi-includes${KRB5INC:+=$KRB5INC}"	#From curl
+			var_append extraconfopt " " "--with-gssapi-libs${KRB5LIB:+=$KRB5LIB}"		#From curl
+			var_append extraconfopt " " "--with-gssapi=$root/$( pkgprefix heimdal )"		#From curl
+
+			# and well known mandatory dependencies
+			var_append extraconfopt " " "--with-ssl"        #from ethereal
+
+			;;
+	esac
+
+	# make tweaks
+	case "$pkg" in
+		emacs)
+			var_append GCC_WRAPPER_APPEND " " "-I$KRB5INC"
+			var_append GCC_WRAPPER_APPEND " " "-L$KRB5LIB"
+			;;
+		cvs|curl|openssh|postgresql)
+			KRB5LIBS="`krb5-config --libs gssapi` -lhdb -lkadm5clnt -lkadm5srv"
+			KRB5CFLAGS=`krb5-config --cflags gssapi`
+
+			var_append CPP_WRAPPER_APPEND ' ' "$KRB5CFLAGS"
+
+			for x in CXX GCC; do
+				var_append ${x}_WRAPPER_APPEND ' ' "$KRB5CFLAGS"
+				var_append ${x}_WRAPPER_APPEND ' ' "$KRB5LIBS"
+			done
+
+			unset KRB5LIBS KRB5CFLAGS
+		;;
+	esac
+
+	# and clean the enviroment
+	unset KRB5PREFIX KRB5INC KRB5LIB
+fi
diff --git a/security/p11-kit/p11-kit.desc b/security/p11-kit/p11-kit.desc
new file mode 100644
index 000000000..d528f582c
--- /dev/null
+++ b/security/p11-kit/p11-kit.desc
@@ -0,0 +1,33 @@
+[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY]
+[COPY] Filename: package/.../p11-kit/p11-kit.desc
+[COPY] Copyright (C) 2013 The OpenSDE Project
+[COPY]
+[COPY] More information can be found in the files COPYING and README.
+[COPY]
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; version 2 of the License. A copy of the
+[COPY] GNU General Public License can be found in the file COPYING.
+[COPY] --- SDE-COPYRIGHT-NOTE-END ---
+
+[I] Library for loading and sharing PKCS#11 modules
+
+[T] p11-kit provides a way to load and enumerate PKCS#11 modules, as well
+[T] as a standard configuration setup for installing PKCS#11 modules in
+[T] such a way that they\'re discoverable.
+
+[U] http://p11-glue.freedesktop.org/p11-kit.html
+
+[A] Stef Walter <stefw@collabora.co.uk>
+[M] The OpenSDE Community <list@opensde.org>
+
+[C] extra/security extra/development
+
+[L] BSD
+[S] Stable
+[V] 0.14
+[P] X -----5---9 109.200
+
+[D] 3313266128 p11-kit-0.14.tar.gz http://p11-glue.freedesktop.org/releases/