diff --git a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild
new file mode 100644
index 0000000000000..1fbe4adaf4769
--- /dev/null
+++ b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Creating, validating, processing HTML forms methods (PHP5 optimize)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+DEPEND=">=dev-lang/php-5.2.0:*"
+RDEPEND="${DEPEND}
+	>=dev-php/PEAR-HTML_Common2-2.0.0"
+
+src_install() {
+	HTML_DOCS=( data/quickform.css data/js )
+	use examples && HTML_DOCS+=( docs/examples )
+	php-pear-r2_src_install
+}
diff --git a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2.ebuild b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2.ebuild
deleted file mode 100644
index 7c52a2f487d65..0000000000000
--- a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="The PEAR::HTML_QuickForm package provides methods for creating, validating, processing HTML forms"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.0:*"
-RDEPEND="${DEPEND}
-	>=dev-php/PEAR-HTML_Common2-2.0.0"