diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index 1fa0ca5..ce823e5 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<use>
+		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">qpdf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/qpdf/qpdf-5.1.2.ebuild b/app-text/qpdf/qpdf-5.1.2-r1.ebuild
similarity index 74%
rename from app-text/qpdf/qpdf-5.1.2.ebuild
rename to app-text/qpdf/qpdf-5.1.2-r1.ebuild
index 7502bc3..c9535eb 100644
--- a/app-text/qpdf/qpdf-5.1.2.ebuild
+++ b/app-text/qpdf/qpdf-5.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-5.1.2.ebuild,v 1.1 2014/06/09 18:33:38 radhermit Exp $
+# $Id$
 
 EAPI="5"
 
@@ -13,17 +13,18 @@
 LICENSE="Artistic-2"
 SLOT="0/13" # subslot = libqpdf soname version
 KEYWORDS="*"
-IUSE="doc examples static-libs test"
+IUSE="doc examples perl static-libs test"
 
 RDEPEND="dev-libs/libpcre
-	sys-libs/zlib
-	>=dev-lang/perl-5.8"
+	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	test? (
 		sys-apps/diffutils
 		media-libs/tiff
 		app-text/ghostscript-gpl
 	)"
+# Only need perl for the installed tools.
+RDEPEND+=" perl? ( >=dev-lang/perl-5.8 )"
 
 DOCS=( ChangeLog README TODO )
 
@@ -41,6 +42,11 @@
 src_install() {
 	default
 
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
 	if use doc ; then
 		dodoc doc/qpdf-manual.pdf
 		dohtml doc/*
diff --git a/metadata/md5-cache/app-text/qpdf-5.1.2 b/metadata/md5-cache/app-text/qpdf-5.1.2
deleted file mode 100644
index dc2fc11..0000000
--- a/metadata/md5-cache/app-text/qpdf-5.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libpcre sys-libs/zlib >=dev-lang/perl-5.8 test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl )
-DESCRIPTION=A command-line program that does structural, content-preserving transformations on PDF files
-EAPI=5
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples static-libs test
-KEYWORDS=*
-LICENSE=Artistic-2
-RDEPEND=dev-libs/libpcre sys-libs/zlib >=dev-lang/perl-5.8
-SLOT=0/13
-SRC_URI=mirror://sourceforge/qpdf/qpdf-5.1.2.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bec089b53c6b11c0ba84063bfecaef32
diff --git a/metadata/md5-cache/app-text/qpdf-5.1.2-r1 b/metadata/md5-cache/app-text/qpdf-5.1.2-r1
new file mode 100644
index 0000000..066e481
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-5.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libpcre sys-libs/zlib test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl )
+DESCRIPTION=A command-line program that does structural, content-preserving transformations on PDF files
+EAPI=5
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples perl static-libs test
+KEYWORDS=*
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libpcre sys-libs/zlib perl? ( >=dev-lang/perl-5.8 )
+SLOT=0/13
+SRC_URI=mirror://sourceforge/qpdf/qpdf-5.1.2.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=37f630348a429b7dea21d384c1e2e4b9