diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index bf3895d7d0670..e39da922c73a0 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -5,5 +5,6 @@ DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a68
 DIST swipl-7.4.1.tar.gz 16498678 SHA256 891e314e8f5d856ef71d8bbce5d255a18b0c8f227628748bb0e1e19473273cc1 SHA512 a3e49cc43aed05808901860fe302711d2850b23740a987d1071822d7b4888aca30a8b5f7c94e1e7191057a031f45adeedb0fbff9139d0294e6ec07032da6798d WHIRLPOOL 5605043173e6bbebed316504b3eb20a0ccc4891d25ae7a7eafc7de6eadef1688367a524e1d81fd0c1ff427e1ece39295555bbf7114deb6056b12b3c3ce2196ed
 DIST swipl-7.4.2.tar.gz 16496738 SHA256 7f17257da334bc1e7a35e9cf5cb8fca01d82f1ea406c7ace76e9062af8f0df8b SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3 WHIRLPOOL 2dad1a5e7ae3670b3a3965010d60420a27cb9623b35cdee83360f6f3a4fadc3dbf2a91fd3e7178b59c9b81723dfe6036fb968953218e7611179b52117a16cb19
 DIST swipl-7.5.10.tar.gz 16734839 SHA256 365941d9863a22949b42a2e0494f4209e96429e2c93f93b369fc9f4512525ddf SHA512 b406fb56f4bdc06e930d7df199fc7f6046634a24ae5545b4721511a588503b64cf7cdbc8579257886f75b3bd5dfec5056f47cf41d51ffc0f0e1e6c7218892ed9 WHIRLPOOL 25c1c2f3bac86c0632ecf0ec27449d19ba51429dbc05ce35d714b1c954098e38f35e4957b2a572451e7b35686ca657cd25e6da470e9429cbeba9c319d39e7756
+DIST swipl-7.5.11.tar.gz 16739697 SHA256 ab8a21ef88e410fc8dfb421bcba7884687fdf08ed85c191e51d806aa831d95e9 SHA512 85d7b4c00b812e5f9a07d89d93efb4c444237b30aa8046a243990f08176fd41414864ec31d0bcb8bc65c41a16dca75846f8196af5540e9abe977cd7ee26a00c2 WHIRLPOOL 5156e832dfd791d3100b4116c8628218b07ebd5c243716a5c5255e9347e2c1f0a83e250746831e200f6020f9bbdcb3c5e5678635dd0c14301639f386dfd12726
 DIST swipl-7.5.8.tar.gz 16689471 SHA256 a02c42506fb5d071c51ddf139fc2ca1d66e9067e24cde5179824381a27c66ccd SHA512 5e494ac0e0389e43c57daf266f1dd0d04c0c7201f3030640b7876fe2f2fb01d6b22a3688213adb45919efd6c05e4c9f67ed9a626ae57bd2ca889c27a3cec3a38 WHIRLPOOL 57ea21a2300f1ad56b6cad5097214c4bc5eb8cafa1c32c29047bd71874b955d30e25b4d2bcd51ddcae2ce3e27bef643b3ee249089dd7d15f9f56afddc9d43f98
 DIST swipl-7.5.9.tar.gz 16699493 SHA256 10064a729b8f8647d9d3544880dd0669b24025448da5e0cab77b2942e69dc7de SHA512 0ed3bf2a7bdd510fa23afe4c435e59934eb5149086377b776a1483de915227f13a646c15db1e8c427f734b2f548916bc3867245c34cb0b234e19af0e92a24a6a WHIRLPOOL b1512fbca346a9e18d90a5c8079fe5a80804b7f94ba22f64770ae56bf673ce0e2c7153d3d21d128e220d03ff614119e95e11aea2a926a65d81475fab99b8032d
diff --git a/dev-lang/swi-prolog/swi-prolog-7.5.11.ebuild b/dev-lang/swi-prolog/swi-prolog-7.5.11.ebuild
new file mode 100644
index 0000000000000..ece2fd907ab4c
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.5.11.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.5:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}