@@ -45,8 +45,6 @@ PHP_P="${PN}-${PHP_PV}"
 
 PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
 
-PHP_FPM_CONF_VER="1"
-
 SRC_URI="${PHP_SRC_URI}"
 
 DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
@@ -253,13 +251,10 @@ php_install_ini() {
 	# SAPI-specific handling
 
 	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
 		einfo "Installing FPM CGI config file php-fpm.conf"
+		dodir "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
 		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+		newins "sapi/fpm/php-fpm.conf" php-fpm.conf
 	fi
 
 	# Install PHP ini files into /usr/share/php
@@ -308,9 +303,13 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
+	epatch "${FILESDIR}/${PN}-fpm.conf.in.patch"
+
 	#Add user patches #357637
 	epatch_user
 
+	sed -e "s|@SLOT@|${SLOT}|g" -i "sapi/fpm/php-fpm.conf.in"
+
 	#force rebuilding aclocal.m4
 	rm aclocal.m4
 	eautoreconf