diff --git a/textproc/erlang-yamerl/Makefile b/textproc/erlang-yamerl/Makefile
index 867bfb8f49ba..dfc40ddeaa1f 100644
--- a/textproc/erlang-yamerl/Makefile
+++ b/textproc/erlang-yamerl/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yamerl
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	erlang-
@@ -15,6 +15,6 @@ USES=		erlang:rebar
 USE_GITHUB=	yes
 GH_ACCOUNT=	yakaz
 
-ERL_DOCS=	README.md doc-md
+ERL_DOCS=	README.md doc
 
 .include <bsd.port.mk>
diff --git a/textproc/erlang-yamerl/distinfo b/textproc/erlang-yamerl/distinfo
index 71f0c367b5eb..0baa3875312d 100644
--- a/textproc/erlang-yamerl/distinfo
+++ b/textproc/erlang-yamerl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477816786
-SHA256 (yakaz-yamerl-v0.3.3_GH0.tar.gz) = ad205063c7f69cee1bc8e4687efa2022b386f4f51692b93b4817b87f0275c68b
-SIZE (yakaz-yamerl-v0.3.3_GH0.tar.gz) = 113568
+TIMESTAMP = 1479804080
+SHA256 (yakaz-yamerl-v0.4.0_GH0.tar.gz) = dd2445eebbd7dbcd37ee776ea618e6c613c9e65d420a40516b444854b72066a1
+SIZE (yakaz-yamerl-v0.4.0_GH0.tar.gz) = 85359
diff --git a/textproc/erlang-yamerl/pkg-plist b/textproc/erlang-yamerl/pkg-plist
index 876d9ef369c2..239b0d2c369c 100644
--- a/textproc/erlang-yamerl/pkg-plist
+++ b/textproc/erlang-yamerl/pkg-plist
@@ -1,7 +1,4 @@
-lib/erlang/lib/yamerl-%%VERSION%%/ebin/Makefile.am
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl.app
-lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl.app.in.in
-lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl.appup.in
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl.beam
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl_app.beam
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl_constr.beam
@@ -29,7 +26,6 @@ lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl_node_timestamp.beam
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl_parser.beam
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl_sup.beam
 lib/erlang/lib/yamerl-%%VERSION%%/ebin/yamerl_yamler_compat.beam
-lib/erlang/lib/yamerl-%%VERSION%%/include/Makefile.am
 lib/erlang/lib/yamerl-%%VERSION%%/include/internal/yamerl_constr.hrl
 lib/erlang/lib/yamerl-%%VERSION%%/include/internal/yamerl_parser.hrl
 lib/erlang/lib/yamerl-%%VERSION%%/include/yamerl_errors.hrl
@@ -37,8 +33,6 @@ lib/erlang/lib/yamerl-%%VERSION%%/include/yamerl_nodes.hrl
 lib/erlang/lib/yamerl-%%VERSION%%/include/yamerl_nodes_yamerl_extensions.hrl
 lib/erlang/lib/yamerl-%%VERSION%%/include/yamerl_tokens.hrl
 lib/erlang/lib/yamerl-%%VERSION%%/include/yamerl_types.hrl
-lib/erlang/lib/yamerl-%%VERSION%%/src/Emakefile.in.in
-lib/erlang/lib/yamerl-%%VERSION%%/src/Makefile.am
 lib/erlang/lib/yamerl-%%VERSION%%/src/yamerl.app.src
 lib/erlang/lib/yamerl-%%VERSION%%/src/yamerl.erl
 lib/erlang/lib/yamerl-%%VERSION%%/src/yamerl_app.erl
@@ -68,12 +62,4 @@ lib/erlang/lib/yamerl-%%VERSION%%/src/yamerl_parser.erl
 lib/erlang/lib/yamerl-%%VERSION%%/src/yamerl_sup.erl
 lib/erlang/lib/yamerl-%%VERSION%%/src/yamerl_yamler_compat.erl
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/README.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/alternatives.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/features.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/installation.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/reference-manual/README.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/reference-manual/module-yamerl_constr.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/user-guide/README.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/user-guide/recipe-basic-parsing.md
-%%PORTDOCS%%%%DOCSDIR%%/doc-md/user-guide/recipe-error-handling.md
+%%PORTDOCS%%%%DOCSDIR%%/doc/overview.edoc