diff --git a/media-libs/opus/opus-1.1.recipe b/media-libs/opus/opus-1.1.recipe
index e6d4f992c..e2cc785f1 100644
--- a/media-libs/opus/opus-1.1.recipe
+++ b/media-libs/opus/opus-1.1.recipe
@@ -1,9 +1,29 @@
-SUMMARY="An interactive audio codec"
-DESCRIPTION="Opus is a totally open, royalty-free, highly versatile audio codec. Opus is \
-unmatched for interactive speech and music transmission over the Internet, but\
-is also intended for storage and streaming applications. It is standardized by\
-the Internet Engineering Task Force (IETF) as RFC 6716 which incorporated\
-technology from Skype's SILK codec and Xiph.Org's CELT codec."
+SUMMARY="The interactive audio codec Opus"
+DESCRIPTION="Opus is a totally open, royalty-free, highly versatile audio \
+codec. Opus is unmatched for interactive speech and music transmission over \
+the Internet, but is also intended for storage and streaming applications. \
+It is standardized by the Internet Engineering Task Force (IETF) as RFC 6716 \
+which incorporated technology from Skype's SILK codec and Xiph.Org's CELT \
+codec.
+
+Opus can handle a wide range of audio applications, including Voice over IP, \
+videoconferencing, in-game chat, and even remote live music performances. It \
+can scale from low bitrate narrowband speech to very high quality stereo \
+music.
+
+Supported features are:
+
+* Bitrates from 6 kb/s to 510 kb/s
+* Sampling rates from 8 kHz (narrowband) to 48 kHz (fullband)
+* Frame sizes from 2.5 ms to 60 ms
+* Support for both constant bitrate (CBR) and variable bitrate (VBR)
+* Audio bandwidth from narrowband to fullband
+* Support for speech and music
+* Support for mono and stereo
+* Support for up to 255 channels (multistream frames)
+* Dynamically adjustable bitrate, audio bandwidth, and frame size
+* Good loss robustness and packet loss concealment (PLC)
+* Floating point and fixed-point implementation"
 HOMEPAGE="http://www.opus-codec.org"
 COPYRIGHT="2001-2014 Xiph.org"
 LICENSE="BSD (3-clause)"
@@ -22,6 +42,14 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	opus${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libopus$secondaryArchSuffix = 0.5.0 compat >= 0
+	"
+REQUIRES_devel="
+	opus$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -52,15 +80,3 @@ INSTALL()
 	packageEntries devel $developDir \
 		$dataDir
 }
-
-
-# ----- devel package -------------------------------------------------------
-
-
-PROVIDES_devel="
-	opus${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libopus$secondaryArchSuffix = 0.5.0 compat >= 0
-	"
-REQUIRES_devel="
-	opus$secondaryArchSuffix == $portVersion base
-	"
diff --git a/media-libs/opus_tools/opus_tools-0.1.9.recipe b/media-libs/opus_tools/opus_tools-0.1.9.recipe
index bec98ad5d..8f14e119d 100644
--- a/media-libs/opus_tools/opus_tools-0.1.9.recipe
+++ b/media-libs/opus_tools/opus_tools-0.1.9.recipe
@@ -1,21 +1,24 @@
-SUMMARY="Opus Interactive Audio Codec"
-DESCRIPTION="
-Opus is a totally open, royalty-free, highly versatile audio codec. Opus is \
-unmatched for interactive speech and music transmission over the Internet, but\
-is also intended for storage and streaming applications. It is standardized by\
-the Internet Engineering Task Force (IETF) as RFC 6716 which incorporated\
-technology from Skype's SILK codec and Xiph.Org's CELT codec.
-"
+SUMMARY="Tools for the interactive audio codec Opus"
+DESCRIPTION="Opus is a totally open, royalty-free, highly versatile audio \
+codec. Opus is unmatched for interactive speech and music transmission over \
+the Internet, but is also intended for storage and streaming applications. \
+It is standardized by the Internet Engineering Task Force (IETF) as RFC 6716 \
+which incorporated technology from Skype's SILK codec and Xiph.Org's CELT \
+codec.
+
+This tools package provides command-line utilities to encode, inspect, and \
+decode .opus files."
 HOMEPAGE="http://www.opus-codec.org"
 COPYRIGHT="2001-2014 Xiph.org"
 LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="http://downloads.xiph.org/releases/opus/opus-tools-$portVersion.tar.gz"
 CHECKSUM_SHA256="b1873dd78c7fbc98cf65d6e10cfddb5c2c03b3af93f922139a2104baedb4643a"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
+SOURCE_DIR="opus-tools-$portVersion"
 PATCHES="opus_tools-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
 PROVIDES="
 	opus_tools$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:opusdec$secondaryArchSuffix
@@ -28,6 +31,7 @@ REQUIRES="
 	lib:libogg$secondaryArchSuffix
 	lib:libopus$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libflac$secondaryArchSuffix
@@ -45,7 +49,6 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:pkg_config$secondaryArchSuffix
 	"
-SOURCE_DIR="opus-tools-$portVersion"
 
 BUILD()
 {
@@ -53,6 +56,7 @@ BUILD()
 	runConfigure ./configure
 	make
 }
+
 INSTALL()
 {
 	make install
diff --git a/media-libs/opusfile/opusfile-0.6.recipe b/media-libs/opusfile/opusfile-0.6.recipe
index e077d4bf9..182f941cb 100644
--- a/media-libs/opusfile/opusfile-0.6.recipe
+++ b/media-libs/opusfile/opusfile-0.6.recipe
@@ -1,17 +1,21 @@
-SUMMARY="Opus Interactive Audio Codec"
-DESCRIPTION="
-Opus is a totally open, royalty-free, highly versatile audio codec. Opus is \
-unmatched for interactive speech and music transmission over the Internet, but\
-is also intended for storage and streaming applications. It is standardized by\
-the Internet Engineering Task Force (IETF) as RFC 6716 which incorporated\
-technology from Skype's SILK codec and Xiph.Org's CELT codec.
-"
+SUMMARY="Library to seek, decode, and playback Opus streams"
+DESCRIPTION="Opus is a totally open, royalty-free, highly versatile audio \
+codec. Opus is unmatched for interactive speech and music transmission over \
+the Internet, but is also intended for storage and streaming applications. \
+It is standardized by the Internet Engineering Task Force (IETF) as RFC 6716 \
+which incorporated technology from Skype's SILK codec and Xiph.Org's CELT \
+codec.
+
+The opusfile library provides seeking, decode, and playback of Opus streams \
+in the Ogg container (.opus files) including over http(s) on posix and \
+windows systems."
 HOMEPAGE="http://www.opus-codec.org"
 COPYRIGHT="2001-2014 Xiph.org"
 LICENSE="BSD (3-clause)"
 SOURCE_URI="http://downloads.xiph.org/releases/opus/opusfile-$portVersion.tar.gz"
 CHECKSUM_SHA256="2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6"
 REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -26,6 +30,16 @@ REQUIRES="
 	lib:libopus$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	opusfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libopusfile$secondaryArchSuffix = 0.3.1 compat >= 0
+	devel:libopusurl$secondaryArchSuffix = 0.3.1 compat >= 0
+	"
+REQUIRES_devel="
+	opusfile$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libogg$secondaryArchSuffix
@@ -51,6 +65,7 @@ BUILD()
 	runConfigure ./configure
 	make
 }
+
 INSTALL()
 {
 	make install
@@ -63,16 +78,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-
-# ----- devel package -------------------------------------------------------
-
-
-PROVIDES_devel="
-	opusfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libopusfile$secondaryArchSuffix = 0.3.1 compat >= 0
-	devel:libopusurl$secondaryArchSuffix = 0.3.1 compat >= 0
-	"
-REQUIRES_devel="
-	opusfile$secondaryArchSuffix == $portVersion base
-	"