diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 3207bb458f107..600de924334ae 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -2,23 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	mairix
-PORTVERSION=	0.23
+DISTVERSION=	0.24
 CATEGORIES=	mail
-MASTER_SITES=	SF
 
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Indexing and searching in Maildir, MH, or mbox folders
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_armv6=		fails to build under emulation: qemu: uncaught target signal 11 (Segmentation fault) - core dumped
-BROKEN_armv7=		fails to build under emulation: qemu: uncaught target signal 11 (Segmentation fault) - core dumped
+BROKEN_armv6=	fails to build under emulation: qemu: uncaught target signal 11 (Segmentation fault) - core dumped
+BROKEN_armv7=	fails to build under emulation: qemu: uncaught target signal 11 (Segmentation fault) - core dumped
 
-USES=		bison gmake
+USES=		bison gmake ssl
 HAS_CONFIGURE=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	vandry
 
-PORTDOCS=	NEWS README
-PORTEXAMPLES=	dotmairixrc.eg
 PLIST_FILES=	bin/mairix \
 		man/man1/mairix.1.gz \
 		man/man5/mairixrc.5.gz
@@ -30,15 +30,11 @@ BZIP2_DESC=	bzip2 compressed mbox support
 GZIP_CONFIGURE_ENABLE=	gzip-mbox
 BZIP2_CONFIGURE_ENABLE=	bzip-mbox
 
-# Do not hardcode make(1) binary name
-post-patch:
-	@${REINPLACE_CMD} -E 's|cd (.+) ; make|$$(MAKE) -C \1|' \
-		${WRKSRC}/Makefile.in
+PORTDOCS=	NEWS README
+PORTEXAMPLES=	dotmairixrc.eg
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mairix ${STAGEDIR}/${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mairix.1 ${STAGEDIR}/${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/mairixrc.5 ${STAGEDIR}/${MANPREFIX}/man/man5
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mairix
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index 4bf403a73b7e2..7c42a153c232b 100644
--- a/mail/mairix/distinfo
+++ b/mail/mairix/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mairix-0.23.tar.gz) = 804e235b183c3350071a28cdda8eb465bcf447092a8206f40486191875bdf2fb
-SIZE (mairix-0.23.tar.gz) = 193726
+TIMESTAMP = 1514803218
+SHA256 (vandry-mairix-0.24_GH0.tar.gz) = 78dfe1773936a57c943260ec6734d2492d0a0345655f28367988dcf3a77aeaec
+SIZE (vandry-mairix-0.24_GH0.tar.gz) = 208060
diff --git a/mail/mairix/files/patch-imap.c b/mail/mairix/files/patch-imap.c
new file mode 100644
index 0000000000000..b6069ef5f77d6
--- /dev/null
+++ b/mail/mairix/files/patch-imap.c
@@ -0,0 +1,18 @@
+--- imap.c.orig	2018-02-20 18:43:53 UTC
++++ imap.c
+@@ -9,11 +9,15 @@
+ #include <time.h>
+ #include <poll.h>
+ #include <signal.h>
++#include <sys/socket.h>
+ #include <sys/wait.h>
+ #ifdef USE_OPENSSL
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+ #endif
++#if defined(__FreeBSD__)
++#define __BSD_VISIBLE 1
++#endif
+ #include "imap.h"
+ 
+ struct imap_ll {
diff --git a/mail/mairix/pkg-descr b/mail/mairix/pkg-descr
index edc04da780c4c..77f50aac7d174 100644
--- a/mail/mairix/pkg-descr
+++ b/mail/mairix/pkg-descr
@@ -1,4 +1,15 @@
 Mairix is a program for indexing and searching email messages stored in
 Maildir, MH or mbox folders.
 
+Features:
+* Indexing is fast. It runs incrementally on new messages - any particular
+  message only gets scanned once in the lifetime of the index file.
+* The search mode populates a "virtual" folder with symlinks(*) which
+  point to the real messages. This folder can be opened as usual in your mail
+  program.
+* The search mode is very fast.
+* Indexing and searching works on the basis of words. The index file tabulates
+  which words occur in which parts (particular headers + body) of which
+  messages.
+
 WWW: http://www.rc0.org.uk/mairix/