diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild
new file mode 100644
index 0000000000000..9d383514ec4f9
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+	apache2? ( www-servers/apache[apache2_modules_dir] )
+	fpm? ( sys-apps/gentoo-functions )"
+
+src_configure(){
+	# We expect localstatedir to be "var"ish, not "var/lib"ish, because
+	# that's what PHP upstream expects. See for example the FPM
+	# configuration where they put logs in @localstatedir@/log.
+	#
+	# The libdir is passed explicitly in case the /usr/lib symlink
+	# is not present (bug 624528).
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		  --localstatedir="${EPREFIX}/var" \
+		  --with-piddir="${EPREFIX}/run" \
+		  $(use_enable apache2) \
+		  $(use_enable fpm)
+}
+
+src_install() {
+	default
+
+	# This can be removed after a while...
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
+	fi
+
+	if use fpm ; then
+		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+		sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
+		exeinto /usr/libexec
+		doexe "${T}"/php-fpm-launcher
+	fi
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		elog
+		elog "If you are upgrading, be warned that our mod_php configuration"
+		elog "file has changed! You should now define -DPHP for the apache2"
+		elog "daemon, and inspect the new 70_mod_php.conf which has been"
+		elog "installed. Module loading involves eselect as of this version."
+		elog
+		elog "You must run eselect at least once to choose your apache2 target"
+		elog "before the new configuration will work. Afterwards, and after you"
+		elog "have reviewed your new configuration, you are advised to remove"
+		elog "the obsolete 70_mod_php5.conf file."
+		elog
+	fi
+}
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index f695558d423ac..a8aa5bb8f4a5e 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -49,8 +49,9 @@ src_install() {
 
 	if use fpm ; then
 		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+		sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
 		exeinto /usr/libexec
-		newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
+		doexe "${T}"/php-fpm-launcher
 	fi
 }
 
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3
new file mode 100644
index 0000000000000..a2b6eabc4da53
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm-launcher-r3
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# If there are no arguments, then "shift" will fail (bug 626496).
+if [ $# -eq 0 ]; then
+    PHP_SLOT=$(eselect php show fpm)
+else
+    PHP_SLOT=$1
+    shift
+fi
+
+exec "/usr/@libdir@/${PHP_SLOT}/bin/php-fpm" "${@}"