diff --git a/mail/abook/Makefile b/mail/abook/Makefile
new file mode 100644
index 00000000000..d50cf5c945a
--- /dev/null
+++ b/mail/abook/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# Original from: Jaakko Heinonen <jheinonen@bigfoot.com>
+
+DISTNAME=		abook-0.4.7
+CATEGORIES=     	mail
+NEED_VERSION=		1.283
+
+HOMEPAGE=		http://www.linuxstart.com/%7Ejheinonen/abook/
+
+MAINTAINER=		reinhard@openbsd.org
+
+FAKE=			Yes
+
+LICENSE_TYPE=		GPL
+PERMIT_PACKAGE_CDROM=	Yes 
+PERMIT_PACKAGE_FTP=	Yes 
+PERMIT_DISTFILES_CDROM=	Yes 
+PERMIT_DISTFILES_FTP=	Yes 
+
+MASTER_SITES=		${HOMEPAGE}
+DISTFILES=		abook-0.4.7
+
+USE_GMAKE=		Yes
+USE_AUTOCONF=		Yes
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/abook ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/abook.1 ${PREFIX}/man/man1
+
+post-install:
+	strip ${PREFIX}/bin/abook
+
+.include <bsd.port.mk>
diff --git a/mail/abook/files/md5 b/mail/abook/files/md5
new file mode 100644
index 00000000000..d8ca0766cbf
--- /dev/null
+++ b/mail/abook/files/md5
@@ -0,0 +1,3 @@
+MD5 (abook-0.4.7) = f67456a997ccfb3b3b9f0bdccdd05d06
+RMD160 (abook-0.4.7) = 9cc7021eab86c2a0f898aa0a6124c4e3e020f416
+SHA1 (abook-0.4.7) = 205778f68564d9f36aa5679a0463eee0ba559112
diff --git a/mail/abook/patches/patch-abook.c b/mail/abook/patches/patch-abook.c
new file mode 100644
index 00000000000..afe21005096
--- /dev/null
+++ b/mail/abook/patches/patch-abook.c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-abook.c,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- abook.c.orig	Wed May 17 11:10:05 2000
++++ abook.c	Mon May 29 15:47:39 2000
+@@ -5,7 +5,7 @@
+  * Copyright (C) 1999, 2000 Jaakko Heinonen
+  */
+ 
+-#include <ncurses.h>
++#include <curses.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/mail/abook/patches/patch-configure.in b/mail/abook/patches/patch-configure.in
new file mode 100644
index 00000000000..02b5bae17c2
--- /dev/null
+++ b/mail/abook/patches/patch-configure.in
@@ -0,0 +1,26 @@
+$OpenBSD: patch-configure.in,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses->curses
+--- configure.in.orig	Sun May 28 14:05:37 2000
++++ configure.in	Mon May 29 14:52:24 2000
+@@ -7,17 +7,17 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(unistd.h locale.h termios.h linux/termios.h sys/ioctl.h stdarg.h varargs.h)
+-AC_CHECK_HEADER(ncurses.h,,AC_MSG_ERROR([*** ncurses.h not installed - please install first ***]))
++AC_CHECK_HEADER(curses.h,,AC_MSG_ERROR([*** curses.h not installed - please install first ***]))
+ AC_CHECK_FUNCS(setlocale)
+ 
+ NCURSES_LIB=error
+-AC_CHECK_LIB(ncurses,initscr, [
+-        NCURSES_LIB="-lncurses" 
++AC_CHECK_LIB(curses,initscr, [
++        NCURSES_LIB="-lcurses" 
+ 	LIBS="$LIBS $NCURSES_LIB"
+ 	])
+ 
+ 	if test "x$NCURSES_LIB" = xerror; then
+-	        AC_MSG_ERROR([ *** ncurses developement libraries not installed - please install first *** ])
++	        AC_MSG_ERROR([ *** curses developement libraries not installed - please install first *** ])
+ fi
+ AC_SUBST(NCURSES_LIB)
+ 
diff --git a/mail/abook/patches/patch-database.c b/mail/abook/patches/patch-database.c
new file mode 100644
index 00000000000..11084619d0a
--- /dev/null
+++ b/mail/abook/patches/patch-database.c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-database.c,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- database.c.orig	Wed May 17 11:10:05 2000
++++ database.c	Mon May 29 15:54:15 2000
+@@ -6,7 +6,7 @@
+  * Copyright (C) Jaakko Heinonen
+  */
+ 
+-#include <ncurses.h>
++#include <curses.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/mail/abook/patches/patch-database.h b/mail/abook/patches/patch-database.h
new file mode 100644
index 00000000000..7be53d56164
--- /dev/null
+++ b/mail/abook/patches/patch-database.h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-database.h,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- database.h.orig	Wed May 17 11:10:05 2000
++++ database.h	Mon May 29 15:41:32 2000
+@@ -44,7 +44,7 @@ void		print_database();
+ 
+ #define LAST_ITEM	(items - 1)
+ 
+-#include <ncurses.h>
++#include <curses.h>
+ #ifndef	getnstr
+ #	define getnstr(s, n)           wgetnstr(stdscr, s, n)
+ #endif
diff --git a/mail/abook/patches/patch-edit.c b/mail/abook/patches/patch-edit.c
new file mode 100644
index 00000000000..335e0a21faa
--- /dev/null
+++ b/mail/abook/patches/patch-edit.c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-edit.c,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- edit.c.orig	Mon May 22 10:04:25 2000
++++ edit.c	Mon May 29 15:48:59 2000
+@@ -6,7 +6,7 @@
+  * Copyright (C) Jaakko Heinonen
+  */
+ 
+-#include <ncurses.h>
++#include <curses.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include "abook.h"
diff --git a/mail/abook/patches/patch-filter.c b/mail/abook/patches/patch-filter.c
new file mode 100644
index 00000000000..c10dbdb4c4d
--- /dev/null
+++ b/mail/abook/patches/patch-filter.c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-filter.c,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- filter.c.orig	Wed May 10 15:57:37 2000
++++ filter.c	Mon May 29 15:50:16 2000
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <ncurses.h>
++#include <curses.h>
+ #include "filter.h"
+ #include "abook.h"
+ #include "database.h"
diff --git a/mail/abook/patches/patch-list.c b/mail/abook/patches/patch-list.c
new file mode 100644
index 00000000000..765c4fe7e62
--- /dev/null
+++ b/mail/abook/patches/patch-list.c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-list.c,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- list.c.orig	Sat May  6 17:26:47 2000
++++ list.c	Mon May 29 15:51:33 2000
+@@ -6,7 +6,7 @@
+  * Copyright (C) Jaakko Heinonen
+  */
+ 
+-#include <ncurses.h>
++#include <curses.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include "abook.h"
diff --git a/mail/abook/patches/patch-options.c b/mail/abook/patches/patch-options.c
new file mode 100644
index 00000000000..07ac7740a59
--- /dev/null
+++ b/mail/abook/patches/patch-options.c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-options.c,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+# ncurses.h->curses.h
+--- options.c.orig	Wed May 17 11:10:06 2000
++++ options.c	Mon May 29 15:52:39 2000
+@@ -6,7 +6,7 @@
+  * Copyright (C) Jaakko Heinonen
+  */
+ 
+-#include <ncurses.h>
++#include <curses.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/mail/abook/pkg/COMMENT b/mail/abook/pkg/COMMENT
new file mode 100644
index 00000000000..25b2e25a0c1
--- /dev/null
+++ b/mail/abook/pkg/COMMENT
@@ -0,0 +1 @@
+addressbook program with mutt support
diff --git a/mail/abook/pkg/DESCR b/mail/abook/pkg/DESCR
new file mode 100644
index 00000000000..c03224aedb1
--- /dev/null
+++ b/mail/abook/pkg/DESCR
@@ -0,0 +1,8 @@
+addressbook program with mutt mail client support
+
+abook uses curses libs and is able to import addressbooks from
+pine and netscape (ldif).
+Exports to mutt alias, html, pine, gcrd (GnomeCard), csv, elm 
+alias, and plain text.
+
+It is nice for querying from within mutt.
diff --git a/mail/abook/pkg/MESSAGE b/mail/abook/pkg/MESSAGE
new file mode 100644
index 00000000000..22c616ecb34
--- /dev/null
+++ b/mail/abook/pkg/MESSAGE
@@ -0,0 +1,4 @@
+
+To use abook from mutt add the following to your muttrc:
+set query_command="/usr/local/bin/abook --mutt-query '%s'"
+
diff --git a/mail/abook/pkg/PLIST b/mail/abook/pkg/PLIST
new file mode 100644
index 00000000000..6366b4e91ab
--- /dev/null
+++ b/mail/abook/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+bin/abook
+man/man1/abook.1
diff --git a/mail/abook/pkg/SECURITY b/mail/abook/pkg/SECURITY
new file mode 100644
index 00000000000..ba637260d09
--- /dev/null
+++ b/mail/abook/pkg/SECURITY
@@ -0,0 +1,4 @@
+$OpenBSD: SECURITY,v 1.1.1.1 2000/05/29 16:46:51 reinhard Exp $
+
+no privileged rights needed.
+various strcat/strcpy/strcmp/sprintf, though not a server program.