diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 461e5055ece..9c8f31b9720 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/06/20 21:35:23 niallo Exp $
+# $OpenBSD: Makefile,v 1.2 2005/12/16 22:17:25 cathcart Exp $
 
 COMMENT=		"program for indexing & searching email"
 
-DISTNAME=		mairix-0.16.1
+DISTNAME=		mairix-0.17
 CATEGORIES=		mail
 HOMEPAGE=		http://www.rpcurnow.force9.co.uk/mairix/
 
-MAINTAINER=		David Cathcart <david@cathcart.cx>
+MAINTAINER=		David Cathcart <cathcart@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes 
@@ -15,7 +15,6 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes 
 
 MASTER_SITES=		http://www.rpcurnow.force9.co.uk/mairix/
-EXTRACT_SUFX=		.tar.gz
 
 WANTLIB=		c
 
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index c16f713fc9c..88fe7b5aa67 100644
--- a/mail/mairix/distinfo
+++ b/mail/mairix/distinfo
@@ -1,4 +1,4 @@
-MD5 (mairix-0.16.1.tar.gz) = 61a46c5d52ebfe7fd13a0e7597febcab
-RMD160 (mairix-0.16.1.tar.gz) = 8f26d7b1fe94a8a9f645c96c9efdc2acbc37e43a
-SHA1 (mairix-0.16.1.tar.gz) = 3fe6e15ec34d903a3fce6299c283b8a0c3d98a02
-SIZE (mairix-0.16.1.tar.gz) = 126356
+MD5 (mairix-0.17.tar.gz) = 2f63f4b0ee17a5cc990a1a3d1e98d603
+RMD160 (mairix-0.17.tar.gz) = a49b93b2c65aae0256ec478489f67c419fe7231c
+SHA1 (mairix-0.17.tar.gz) = 079d20d1a4a3f1da0835f6c6cd792502d00379ac
+SIZE (mairix-0.17.tar.gz) = 129058
diff --git a/mail/mairix/patches/patch-dfasyn_n2d_h b/mail/mairix/patches/patch-dfasyn_n2d_h
new file mode 100644
index 00000000000..4dabd5c9aa0
--- /dev/null
+++ b/mail/mairix/patches/patch-dfasyn_n2d_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-dfasyn_n2d_h,v 1.1 2005/12/16 22:17:26 cathcart Exp $
+--- dfasyn/n2d.h.orig	Fri Dec 16 22:09:17 2005
++++ dfasyn/n2d.h	Fri Dec 16 22:09:27 2005
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#define new(T) ((T *) malloc(sizeof(T)))
++#define new(T) ((T *) calloc(1, sizeof(T)))
+ #define new_array(T,N) ((T *) malloc((N) * sizeof(T)))
+ #define resize_array(T,arr,newN) ((T *) ((arr) ? realloc(arr,(newN)*sizeof(T)) : malloc((newN)*sizeof(T))))
+ #define new_string(s) strcpy((char *)malloc((strlen(s)+1)*sizeof(char)),s)