diff -urN /usr/ports/devel/aifad/Makefile devel/aifad/Makefile
--- /usr/ports/devel/aifad/Makefile	2015-11-09 22:25:15.740648000 +0900
+++ devel/aifad/Makefile	2015-12-11 00:00:00.000000000 +0900
@@ -2,15 +2,14 @@
 # $FreeBSD: head/devel/aifad/Makefile 401096 2015-11-09 12:59:03Z antoine $
 
 PORTNAME=	aifad
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.6
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-MASTER_SITES=	http://cdn.bitbucket.org/mmottl/aifad/downloads/
+MASTER_SITES=	GH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Machine learning system
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir \
@@ -19,19 +18,29 @@
 		ocaml-res>0:${PORTSDIR}/devel/ocaml-res
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	mmottl
+
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix ${STAGEDIR}${PREFIX}
 
+PORTDOCS=	AUTHORS.txt CHANGES.txt README.md TODO.md
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/aifad
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aifad
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS.txt CHANGES.txt README.md \
-		TODO.md ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
 
diff -urN /usr/ports/devel/aifad/distinfo devel/aifad/distinfo
--- /usr/ports/devel/aifad/distinfo	2015-08-24 03:52:18.056293000 +0900
+++ devel/aifad/distinfo	2015-12-11 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (aifad-2.0.2.tar.gz) = c265614a2dcc893eaab7e559cd8a6b446e09d3262974bb7e01b3c453c80356a8
-SIZE (aifad-2.0.2.tar.gz) = 103080
+SHA256 (mmottl-aifad-v2.0.6_GH0.tar.gz) = e7f66d8af30e6c95efadffb07e447bd8596ae20f92ec96429799b51c3c559f99
+SIZE (mmottl-aifad-v2.0.6_GH0.tar.gz) = 107722
diff -urN /usr/ports/devel/aifad/pkg-descr devel/aifad/pkg-descr
--- /usr/ports/devel/aifad/pkg-descr	2015-08-24 03:52:18.056717000 +0900
+++ devel/aifad/pkg-descr	2015-12-11 00:00:00.000000000 +0900
@@ -1,7 +1,7 @@
 AIFAD stands for --Automated Induction of Functions over Algebraic
-Datatypes-- and improves decision tree learning by supporting significantly
-more complex kinds of data. This allows users to more conveniently describe
-the data they want to have learnt, which can improve accuracy and complexity
-of resulting models.
+Datatypes-- and improves decision tree learning by supporting
+significantly more complex kinds of data. This allows users to more
+conveniently describe the data they want to have learnt, which can
+improve accuracy and complexity of resulting models.
 
-WWW: https://bitbucket.org/mmottl/aifad
+WWW: https://mmottl.github.io/aifad
diff -urN /usr/ports/devel/aifad/pkg-plist devel/aifad/pkg-plist
--- /usr/ports/devel/aifad/pkg-plist	2015-08-24 03:52:18.049394000 +0900
+++ devel/aifad/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
-bin/aifad
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/TODO.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/breast_cancer1.add
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/breast_cancer1.ads
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/breast_cancer2.add
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/breast_cancer2.ads
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c45.data
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c45.names
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/large.ads
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.add
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.ads