diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index 51d2814cdc0c7..9e7b14f3e3fb1 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1,2 +1,3 @@
 DIST JWasm210s.zip 939008 SHA256 8d9a5ac95fa07a8e935423f3d1e44127c79d873e380f04d1ce8e1a65ca7daafd SHA512 fed6a02e9c58d8c8e4ad83cfd93207c99dc2cc73626188abc2f376465f72dea5ad2ac747b2832cfd8053220b76fdfd58b89d9e484f380c2eb0af2b541f24ca7e WHIRLPOOL 703f860303008cfadd6b42e36aee92e32d5b19af6f70040b083408e43ab5b7bbf83539c5ee96202c6a613ba8640ce2c8e18c465b853e1ac1727e03f30b2b10e8
+DIST JWasm211as.zip 1004993 SHA256 6c7b8b4bc576a4e9d50a452f1b3117bb67e6043c34ac971f3cb250d2c2a55ae4 SHA512 3e48e09955ccf8e641b36f54c93c3f36b275a0e662013a17dfd1f52a3e2872eff54be869596d0e72bdb2cc7e59c8fd1dee13477bf89a59bba4b212959cff9006 WHIRLPOOL 2b2bfd100b86dc749e77a0c99d77adf355a76ffbb0fee5464dd57e506c9178338368a3be7240c46a78c66f573ce25c8d7e1d0a4bedd388268b2932af7c5efd85
 DIST JWasm211s.zip 1006791 SHA256 6d5ab10908fbedddf652b2c683e9fdf450caae9741082c1077100308d0879146 SHA512 acbe102b8c6c5d1fdc3ae80944cc3c0fcf287b6ee967b13251ea3e2bcf9547a772c7c658f4f90e8da70b60749add59d5ab321773dc317eac652325b2bd874dd6 WHIRLPOOL e2c28b46aa3d2d53e879f06931fa4ff3d7701541eb4fec7595b7df0c6682ddf72843ba04d072e2d55eb74139041c21a86298a03dad997c8f5b73cbc91958dbc6
diff --git a/dev-lang/jwasm/jwasm-2.11a.ebuild b/dev-lang/jwasm/jwasm-2.11a.ebuild
new file mode 100644
index 0000000000000..ee5cce60a6ef3
--- /dev/null
+++ b/dev-lang/jwasm/jwasm-2.11a.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs versionator
+
+# 2.10 -> 210s
+MY_PN=JWasm
+MY_PV="$(delete_version_separator 1)s"
+MY_P="${MY_PN}${MY_PV}"
+
+DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
+HOMEPAGE="https://sourceforge.net/projects/jwasm/"
+SRC_URI="mirror://sourceforge/${PN}/JWasm%20Source%20Code/${MY_P}.zip"
+LICENSE="Watcom-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.11-types-test.patch
+	# don't strip binary
+	sed -i GccUnix.mak -e 's/ -s / /g' || die
+}
+
+src_compile() {
+	emake -f GccUnix.mak CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin GccUnixR/jwasm
+	dodoc *.txt Doc/*.txt
+}