diff --git a/media-libs/leptonica/leptonica-1.73.recipe b/media-libs/leptonica/leptonica-1.73.recipe
index 12f342997..6e6fba59f 100644
--- a/media-libs/leptonica/leptonica-1.73.recipe
+++ b/media-libs/leptonica/leptonica-1.73.recipe
@@ -1,18 +1,18 @@
 SUMMARY="A C library for image processing and analysis operations"
-DESCRIPTION="
-A powerful open source C library for efficient image processing \
+DESCRIPTION="A powerful open source C library for efficient image processing \
 and image analysis operations. It's long list of features includes:
 * image transformations (scaling, rotation, etc.)
 * change scale and pixel depth
 * pixelwise masking, blending, and enhancement
-* can open and save standard image formats
-"
+* can open and save standard image formats"
 HOMEPAGE="http://www.leptonica.org/"
+COPYRIGHT="2001-2012 Dan Bloomberg"
+LICENSE="BSD (2-clause)"
+REVISION="4"
 SOURCE_URI="http://www.leptonica.org/source/leptonica-$portVersion.tar.gz"
 CHECKSUM_SHA256="19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2001-2012 Dan Bloomberg"
-REVISION="3"
+PATCHES="leptonica-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -20,76 +20,24 @@ PROVIDES="
 	leptonica$secondaryArchSuffix = $portVersion
 	lib:liblept$secondaryArchSuffix = 5.0.0 compat >= 5
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	lib:libwebp$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libgif$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:ar$secondaryArchSuffix
-	cmd:autoconf
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:makeinfo
-	"
-
-PATCHES="leptonica-$portVersion.patchset"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake -a
-	# override CFLAGS to make gcc2 happy by not passing the -g option
-	CFLAGS=-O2 runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	fixPkgconfig
-	prepareInstalledDevelLibs liblept
-
-	packageEntries devel \
-				$developDir
-
-	packageEntries tools \
-				$binDir
-}
-
-# ----- devel package -------------------------------------------------------
-
 PROVIDES_devel="
 	leptonica${secondaryArchSuffix}_devel = $portVersion
 	devel:liblept$secondaryArchSuffix = 5.0.0 compat >= 5
 	"
-
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
 
-# ----- tools package -------------------------------------------------------
-
 PROVIDES_tools="
 	leptonica${secondaryArchSuffix}_tools = $portVersion
 	cmd:adaptmaptest$secondaryArchSuffix = $portVersion
@@ -308,3 +256,47 @@ REQUIRES_tools="
 	haiku$secondaryArchSuffix
 	leptonica$secondaryArchSuffix == $portVersion base
 	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgif$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:ar$secondaryArchSuffix
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake -a
+	# override CFLAGS to make gcc2 happy by not passing the -g option
+	CFLAGS=-O2 runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	fixPkgconfig
+	prepareInstalledDevelLibs liblept
+
+	packageEntries devel \
+				$developDir
+
+	packageEntries tools \
+				$binDir
+}