diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile
index c0114b6ee308..f0817034e88d 100644
--- a/lang/alchemist.el/Makefile
+++ b/lang/alchemist.el/Makefile
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	alchemist.el
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Elixir Tooling Integration Into Emacs
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	elixir-mode.el>=0:${PORTSDIR}/lang/elixir-mode.el
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonini
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_EMACS=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
 	${INSTALL_DATA} ${WRKSRC}/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/alchemist-server/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server
-	${INSTALL_DATA} ${WRKSRC}/alchemist-server/lib/*.exs ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
+	cd ${WRKSRC}/alchemist-server/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/alchemist-server/lib
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/alchemist.el/distinfo b/lang/alchemist.el/distinfo
index e10cdce4d35d..241f1d2e7aca 100644
--- a/lang/alchemist.el/distinfo
+++ b/lang/alchemist.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tonini-alchemist.el-v1.5.2_GH0.tar.gz) = ef86ae34853531e8e7d36a1a9aa6cb6ced10ca9ee176a6682b15ed4c12fd6b7c
-SIZE (tonini-alchemist.el-v1.5.2_GH0.tar.gz) = 1721521
+SHA256 (tonini-alchemist.el-v1.6.0_GH0.tar.gz) = d9c5519c41006475d8a3d278d9d0fc04a870cbaecd3994094b187e66fb530e8b
+SIZE (tonini-alchemist.el-v1.6.0_GH0.tar.gz) = 1727219
diff --git a/lang/alchemist.el/pkg-plist b/lang/alchemist.el/pkg-plist
index c1c61b42ee14..eadac79cb492 100644
--- a/lang/alchemist.el/pkg-plist
+++ b/lang/alchemist.el/pkg-plist
@@ -1,31 +1,38 @@
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/alchemist-refcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/alchemist-refcard.tex
 %%EMACS_SITE_LISPDIR%%/alchemist-company.el
 %%EMACS_SITE_LISPDIR%%/alchemist-compile.el
 %%EMACS_SITE_LISPDIR%%/alchemist-complete.el
 %%EMACS_SITE_LISPDIR%%/alchemist-eval.el
 %%EMACS_SITE_LISPDIR%%/alchemist-execute.el
+%%EMACS_SITE_LISPDIR%%/alchemist-file.el
 %%EMACS_SITE_LISPDIR%%/alchemist-goto.el
 %%EMACS_SITE_LISPDIR%%/alchemist-help.el
 %%EMACS_SITE_LISPDIR%%/alchemist-hooks.el
 %%EMACS_SITE_LISPDIR%%/alchemist-iex.el
+%%EMACS_SITE_LISPDIR%%/alchemist-interact.el
+%%EMACS_SITE_LISPDIR%%/alchemist-key.el
+%%EMACS_SITE_LISPDIR%%/alchemist-macroexpand.el
 %%EMACS_SITE_LISPDIR%%/alchemist-message.el
 %%EMACS_SITE_LISPDIR%%/alchemist-mix.el
+%%EMACS_SITE_LISPDIR%%/alchemist-phoenix.el
 %%EMACS_SITE_LISPDIR%%/alchemist-project.el
 %%EMACS_SITE_LISPDIR%%/alchemist-refcard.el
 %%EMACS_SITE_LISPDIR%%/alchemist-report.el
 %%EMACS_SITE_LISPDIR%%/alchemist-scope.el
 %%EMACS_SITE_LISPDIR%%/alchemist-server.el
-%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/case.exs
-%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/completer.exs
-%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/documentation.exs
-%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/informant.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/api/comp.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/api/defl.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/api/docl.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/api/eval.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/api/info.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/helpers/complete.exs
+%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/helpers/module_info.exs
 %%EMACS_SITE_LISPDIR%%/alchemist-server/lib/server.exs
-%%EMACS_SITE_LISPDIR%%/alchemist-server/lib/source.exs
 %%EMACS_SITE_LISPDIR%%/alchemist-server/run.exs
 %%EMACS_SITE_LISPDIR%%/alchemist-test-mode.el
 %%EMACS_SITE_LISPDIR%%/alchemist-utils.el
 %%EMACS_SITE_LISPDIR%%/alchemist.el