diff --git a/srcpkgs/erlang-doc b/srcpkgs/erlang-doc
new file mode 120000
index 00000000000..8d91700f27a
--- /dev/null
+++ b/srcpkgs/erlang-doc
@@ -0,0 +1 @@
+erlang
\ No newline at end of file
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 49e5bcac3aa..bf9be412e67 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,26 +1,26 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=21.2
+version=21.2.6
 revision=1
 create_wrksrc=yes
-build_wrksrc=otp_src_${version}
+build_wrksrc=otp-OTP-${version}
 build_style=gnu-configure
 configure_args="$(vopt_if x11 --with-wx-config=wx-config-3.0)"
-hostmakedepends="perl libxslt"
+make_install_target="install install-docs"
+hostmakedepends="perl libxslt autoconf"
 makedepends="ncurses-devel unixodbc-devel libressl-devel zlib-devel
  $(vopt_if x11 'wxWidgets-devel glu-devel')"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://www.erlang.org/"
-distfiles="http://www.erlang.org/download/otp_src_${version}.tar.gz
- http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"
-checksum="f6b07bf8e6705915679a63363ce80faaa6b7c231e7236cde443d6445f7430334
- e85a782e0fcd38b92098110b320e28ea8030cce318868d99a4fe6d17ae08b778"
+distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
+checksum="aa0b95031e7c01af8a7042a00974ab16ed8fec305a68d7dbaa4185e5d58ef4d5"
 
 build_options="x11"
 
 pre_configure() {
+	./otp_build autoconf
 	if [ "$CROSS_BUILD" ]; then
 		# Build the bootstrap compiler for the host platform.
 		env - PATH=/usr/bin:/usr/sbin ./configure --enable-bootstrap-only
@@ -29,14 +29,34 @@ pre_configure() {
 		export erl_xcomp_sysroot=/usr/${XBPS_CROSS_TRIPLET}
 	fi
 }
+
 post_configure() {
-	sed -i '/LDFLAGS =/s/=/+=/' lib/odbc/c_src/*/Makefile
+	vsed -i -e '/LDFLAGS =/s/=/+=/' lib/odbc/c_src/*/Makefile
 }
+
 post_install() {
-	vmkdir usr/share/man
-	vmkdir usr/lib/erlang/man
-	vcopy ../man/man1 usr/share/man
-	vcopy ../man/man3 usr/lib/erlang/man
-	vcopy ../man/man4 usr/lib/erlang/man
-	vcopy ../man/man7 usr/lib/erlang/man
+	# Remove PR template and PDF documentation
+	rm ${DESTDIR}/usr/lib/erlang/PR.template
+	find ${DESTDIR}/usr/lib/erlang -path '*/doc/pdf' -type d -print0 | xargs -0 rm -rf
+	find ${DESTDIR}/usr/lib/erlang -iname '*.pdf' -delete
+	# Make section 1 pages available outside erlang
+	vmkdir usr/share/man/man1
+	local manprefix=/usr/lib/erlang/man/man1
+	for i in $(find ${DESTDIR}${manprefix} -type f)
+	do
+		ln -sf ${manprefix}/${i##*/} ${DESTDIR}/usr/share/man/man1
+	done
+}
+
+erlang-doc_package() {
+	short_desc="Erlang programming language documentation and examples"
+	depends="${sourcepkg}-${version}_${revision}"
+	archs=noarch
+	pkg_install() {
+		vmove usr/lib/erlang/doc
+		for i in $(cd ${DESTDIR}; find usr/lib/erlang -type d \( -path '*/examples' -o -path '*/doc/html' \))
+		do
+			vmove "$i"
+		done
+	}
 }
diff --git a/srcpkgs/erlang/update b/srcpkgs/erlang/update
deleted file mode 100644
index b2254921c63..00000000000
--- a/srcpkgs/erlang/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.erlang.org/download.html"
-pattern='otp_src_\K[\d.]+\d+'