diff --git a/mail/Makefile b/mail/Makefile
index 537cad3a2362..078a06409f1d 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -6,6 +6,7 @@
     SUBDIR += abook
     SUBDIR += adcomplain
     SUBDIR += addresses
+    SUBDIR += addresses-goodies
     SUBDIR += akpop3d
     SUBDIR += altermime
     SUBDIR += althea
diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
new file mode 100644
index 000000000000..82ead80d6f98
--- /dev/null
+++ b/mail/addresses-goodies/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:    addresses-goodies
+# Date created:         29 Nov 2006
+# Whom:                 dirk.meyer@dinoex.sub.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	addresses
+PORTVERSION=	0.4.6
+CATEGORIES=	mail
+MASTER_SITES=	http://giesler.biz/bjoern/downloads/ \
+		http://www.energyhq.es.eu.org/files/
+PKGNAMESUFFIX=	-goodies${PKGNAMESUFFIX2}
+DISTNAME=	Addresses-${PORTVERSION}
+
+MAINTAINER=	dinoex@FreeBSD.org
+COMMENT=	Goodies for addressbook for GNUstep
+
+USE_GNUSTEP=	yes
+USE_GNUSTEP_PREFIX=	yes
+USE_GNUSTEP_BACK=	yes
+USE_GNUSTEP_BUILD=	yes
+USE_GNUSTEP_INSTALL=	yes
+USE_GNUSTEP_SYSTEM_LIBS+=	Inspector:${GWORKSPACE_PORT}
+USE_GNUSTEP_LOCAL_LIBS+=	Addresses:${ADDRESSES_PORT}
+USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+
+WRKSRC=		${WRKDIR}/Addresses-${PORTVERSION}/Goodies
+
+ADDRESSES_PORT?=	mail/addresses
+GWORKSPACE_PORT?=	deskutils/gworkspace
+
+post-patch:
+	${REINPLACE_CMD} -e 's|LDAPAddressBook||' \
+		${WRKSRC}/GNUmakefile
+	${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \
+		-e 's|GNUSTEP_INSTALLATION_DIR|GNUSTEP_SYSTEM_ROOT|' \
+		-e 's|Library/GWorkspace|Library/Bundles|' \
+		-e 's|-lGWorkspace|-lInspector|' \
+		${WRKSRC}/VCFViewer/GNUmakefile
+	${REINPLACE_CMD} -e 's|<GWorkspace/|<Inspector/|' \
+		${WRKSRC}/VCFViewer/VCFViewer.h
+
+.include <bsd.port.mk>
diff --git a/mail/addresses-goodies/distinfo b/mail/addresses-goodies/distinfo
new file mode 100644
index 000000000000..fac15831a5e9
--- /dev/null
+++ b/mail/addresses-goodies/distinfo
@@ -0,0 +1,3 @@
+MD5 (Addresses-0.4.6.tar.gz) = 2d6b6bf9a1578a5b3a13cb0bd2c60fad
+SHA256 (Addresses-0.4.6.tar.gz) = a901d13676b745c3523f581824434387e592cb721df7b3d3719496946c610155
+SIZE (Addresses-0.4.6.tar.gz) = 444463
diff --git a/mail/addresses-goodies/pkg-descr b/mail/addresses-goodies/pkg-descr
new file mode 100644
index 000000000000..b482a9345b74
--- /dev/null
+++ b/mail/addresses-goodies/pkg-descr
@@ -0,0 +1,5 @@
+Addresses for GNUstep is a versatile address book application.
+
+This ports installes additional tools.
+
+WWW: http://giesler.biz/bjoern/en/sw_addr.html
diff --git a/mail/addresses-goodies/pkg-plist b/mail/addresses-goodies/pkg-plist
new file mode 100644
index 000000000000..620442f85463
--- /dev/null
+++ b/mail/addresses-goodies/pkg-plist
@@ -0,0 +1,10 @@
+Local/Tools/adgnumailconverter
+Local/Tools/adserver
+Local/Tools/adtool
+System/Library/Bundles/VCFViewer.inspector/Resources/Info-gnustep.plist
+System/Library/Bundles/VCFViewer.inspector/Resources/InspectorInfo.plist
+System/Library/Bundles/VCFViewer.inspector/Resources/VCFImage.tiff
+System/Library/Bundles/VCFViewer.inspector/VCFViewer
+System/Library/Bundles/VCFViewer.inspector/stamp.make
+@dirrm System/Library/Bundles/VCFViewer.inspector/Resources
+@dirrm System/Library/Bundles/VCFViewer.inspector