diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 3856b30a2d5..a9e972fc686 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/19 07:23:07 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2012/04/25 13:07:26 gonzalo Exp $
 
 COMMENT=		program for indexing & searching email
 
-DISTNAME=		mairix-0.21
-REVISION =		0
+DISTNAME=		mairix-0.22
 CATEGORIES=		mail
 HOMEPAGE=		http://www.rpcurnow.force9.co.uk/mairix/
 
 MAINTAINER=		David Cathcart <cathcart@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM= Yes 
@@ -26,7 +25,6 @@ LIB_DEPENDS=		archivers/bzip2
 CONFIGURE_STYLE=	simple
 CONFIGURE_ENV= 		CPPFLAGS="-I${PREFIX}/include" \
 			LDFLAGS="-L${PREFIX}/lib"
-USE_GROFF =		Yes
 
 NO_REGRESS=		Yes
 
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index 767f4ea5969..63923a718d7 100644
--- a/mail/mairix/distinfo
+++ b/mail/mairix/distinfo
@@ -1,5 +1,5 @@
-MD5 (mairix-0.21.tar.gz) = ghYZiVkxcRw3D1HzRCoN7Q==
-RMD160 (mairix-0.21.tar.gz) = aOnQz1CchSSqni9Rm0OF/RmPmWo=
-SHA1 (mairix-0.21.tar.gz) = pfR2dGLT+GlQrKoNr9Ey3g4NDEM=
-SHA256 (mairix-0.21.tar.gz) = 4dKEWVMc4wzo3UEhXLDmNR6oF2fPS78ejb0iYY9N4dc=
-SIZE (mairix-0.21.tar.gz) = 159089
+MD5 (mairix-0.22.tar.gz) = bGqsoZwrLeO/VnuFZwXOGg==
+RMD160 (mairix-0.22.tar.gz) = Wn0DQb1d4tXHDZibY7sh+A1xeRw=
+SHA1 (mairix-0.22.tar.gz) = Nc/BahRKYB+9PJISx78YFa3fBfY=
+SHA256 (mairix-0.22.tar.gz) = FB+yc++fd1YuYJqfbS94O2gMxOBL4PnKjWgvi8bBnU8=
+SIZE (mairix-0.22.tar.gz) = 161843
diff --git a/mail/mairix/pkg/PLIST b/mail/mairix/pkg/PLIST
index 7e62082a615..a8901e1f8f4 100644
--- a/mail/mairix/pkg/PLIST
+++ b/mail/mairix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/04/25 01:08:34 msf Exp $
-bin/mairix
+@comment $OpenBSD: PLIST,v 1.3 2012/04/25 13:07:26 gonzalo Exp $
+@bin bin/mairix
 @man man/man1/mairix.1
 @man man/man5/mairixrc.5