diff --git a/security/Makefile b/security/Makefile
index 7e93ba12d45f..51a5307f2180 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -259,6 +259,7 @@
     SUBDIR += py-twofish
     SUBDIR += qident
     SUBDIR += qtfw
+    SUBDIR += quintuple-agent
     SUBDIR += racoon
     SUBDIR += radiusniff
     SUBDIR += rain
diff --git a/security/quintuple-agent/Makefile b/security/quintuple-agent/Makefile
new file mode 100644
index 000000000000..188b18fd3f28
--- /dev/null
+++ b/security/quintuple-agent/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	quintuple-agent
+# Date created:			2003-02-06
+# Whom:				Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	quintuple-agent
+PORTVERSION=	1.0.3
+CATEGORIES=	security
+MASTER_SITES=	http://www.vibe.at/tools/q-agent/
+
+MAINTAINER=	stolz@i2.informatik.rwth-aachen.de
+
+LIB_DEPENDS+=	intl.4:${PORTSDIR}/devel/gettext
+
+USE_GNOMENG=	yes
+USE_GNOME=	glib12
+.ifndef(WITHOUT_X11)
+USE_GNOME+=	gtk12
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
+.endif
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
+#catgets disabled because it can't find all messages:
+#CONFIGURE_ARGS+=--with-catgets
+.ifdef(WITHOUT_X11)
+CONFIGURE_ARGS+=--disable-gtktest
+.endif
+
+MAN1=	agpg.1 apgp.1 q-agent.1 secret-ask.1 q-client.1 secret-query.1
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/security/quintuple-agent/distinfo b/security/quintuple-agent/distinfo
new file mode 100644
index 000000000000..caa0a0f6ac84
--- /dev/null
+++ b/security/quintuple-agent/distinfo
@@ -0,0 +1 @@
+MD5 (quintuple-agent-1.0.3.tar.gz) = dc999c047855f2fbcd2fc79972ced6f2
diff --git a/security/quintuple-agent/pkg-comment b/security/quintuple-agent/pkg-comment
new file mode 100644
index 000000000000..b47108100874
--- /dev/null
+++ b/security/quintuple-agent/pkg-comment
@@ -0,0 +1 @@
+Quintuple Agent is a program that stores secrets for you
diff --git a/security/quintuple-agent/pkg-descr b/security/quintuple-agent/pkg-descr
new file mode 100644
index 000000000000..a06c47229fd2
--- /dev/null
+++ b/security/quintuple-agent/pkg-descr
@@ -0,0 +1,7 @@
+Quintuple Agent is a program that stores secrets for you.
+
+   An example usage of Quintuple Agent would be for the storage of a
+passphrase.  This way you will have to enter the passphrase only once
+in a while, not everytime it is needed.
+
+WWW: http://www.vibe.at/tools/q-agent/
diff --git a/security/quintuple-agent/pkg-message b/security/quintuple-agent/pkg-message
new file mode 100644
index 000000000000..861ea46f953a
--- /dev/null
+++ b/security/quintuple-agent/pkg-message
@@ -0,0 +1,5 @@
+
+You might want to consider making at least q-agent setuid root
+so that it can successfully use mlock() to protect your secrets
+in memory.
+
diff --git a/security/quintuple-agent/pkg-plist b/security/quintuple-agent/pkg-plist
new file mode 100644
index 000000000000..9ac7557b472a
--- /dev/null
+++ b/security/quintuple-agent/pkg-plist
@@ -0,0 +1,13 @@
+bin/agpg
+bin/apgp
+bin/q-agent
+bin/q-client
+%%X11%%bin/secret-query
+%%X11%%bin/secret-ask
+share/locale/de/LC_MESSAGES/quintuple-agent.mo
+share/locale/es_ES/LC_MESSAGES/quintuple-agent.mo
+share/locale/fr/LC_MESSAGES/quintuple-agent.mo
+share/locale/it/LC_MESSAGES/quintuple-agent.mo
+share/locale/pl/LC_MESSAGES/quintuple-agent.mo
+share/locale/pt_BR/LC_MESSAGES/quintuple-agent.mo
+share/locale/ru/LC_MESSAGES/quintuple-agent.mo