diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 3207bb458f10..c1aa37ec0b41 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -2,27 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	mairix
-PORTVERSION=	0.23
+PORTVERSION=	0.24
 CATEGORIES=	mail
-MASTER_SITES=	SF
 
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Indexing and searching in Maildir, MH, or mbox folders
 
 LICENSE=	GPLv2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	vandry
+
 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
 
-PORTDOCS=	NEWS README
-PORTEXAMPLES=	dotmairixrc.eg
-PLIST_FILES=	bin/mairix \
-		man/man1/mairix.1.gz \
-		man/man5/mairixrc.5.gz
-
 OPTIONS_DEFINE=	GZIP BZIP2 EXAMPLES DOCS
 GZIP_DESC=	gzip compressed mbox support
 BZIP2_DESC=	bzip2 compressed mbox support
@@ -30,18 +26,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
-
-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:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dotmairixrc.eg ${STAGEDIR}/${EXAMPLESDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mairix
 
 .include <bsd.port.mk>
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index 4bf403a73b7e..7c42a153c232 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.h b/mail/mairix/files/patch-imap.h
new file mode 100644
index 000000000000..67efc16af9ad
--- /dev/null
+++ b/mail/mairix/files/patch-imap.h
@@ -0,0 +1,16 @@
+--- imap.h.orig	2017-08-13 21:55:52 UTC
++++ imap.h
+@@ -4,7 +4,13 @@
+ #ifdef USE_OPENSSL
+ #include <openssl/ssl.h>
+ #endif
++
++#if defined(_FreeBSD_)
++#define __BSD_VISIBLE 1
++#endif
++
+ #include <poll.h>
++#include <sys/socket.h>
+ 
+ enum imap_ll_tltype {
+ 	TLTYPE_UNTAGGED = 1,
diff --git a/mail/mairix/pkg-plist b/mail/mairix/pkg-plist
new file mode 100644
index 000000000000..4e26da1851da
--- /dev/null
+++ b/mail/mairix/pkg-plist
@@ -0,0 +1,6 @@
+bin/mairix
+man/man1/mairix.1.gz
+man/man5/mairixrc.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dotmairixrc.eg