diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r2.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r2.ebuild
deleted file mode 100644
index 9c99d332ea9c4..0000000000000
--- a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages"
-LICENSE="PHP-2.02"
-SLOT="0"
-IUSE=""
-
-for target in ${USE_PHP}; do
-	slot=${target/php}
-	slot=${slot/-/.}
-	PHPUSEDEPEND="${PHPUSEDEPEND}
-	php_targets_${target}? ( dev-lang/php:${slot}[unicode] )"
-done
-
-RDEPEND="${PHPUSEDEPEND}"
-DEPEND="${RDEPEND}
-	dev-util/re2c"
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
new file mode 100644
index 0000000000000..97a2d1cb80413
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="mailparse"
+DOCS=( README )
+
+USE_PHP="php5-5 php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing RFC822 and RFC2045 (MIME) messages"
+LICENSE="PHP-2.02"
+SLOT="0"
+IUSE=""
+
+for _target in ${USE_PHP}; do
+	_slot=${_target/php}
+	_slot=${_slot/-/.}
+	_PHPUSEDEPEND="${_PHPUSEDEPEND}
+	php_targets_${_target}? ( dev-lang/php:${_slot}[unicode] )"
+done
+unset slot target
+
+RDEPEND="${_PHPUSEDEPEND}"
+unset _PHPUSEDEPEND
+DEPEND="${RDEPEND}
+	dev-util/re2c"