diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe
deleted file mode 100644
index 03aad7fb5..000000000
--- a/media-libs/openjpeg/openjpeg-1.5.0.recipe
+++ /dev/null
@@ -1,97 +0,0 @@
-SUMMARY="An open-source C-Library for JPEG 2000"
-DESCRIPTION="The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \
-It has been developed in order to promote the use of JPEG 2000, the new \
-still-image compression standard from the Joint Photographic Experts Group \
-(JPEG). In addition to the basic codec, various other features are under \
-development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an \
-indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, \
-a Java-viewer for j2k-images."
-HOMEPAGE="http://www.openjpeg.org/"
-COPYRIGHT="2002-2012 Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
-	2002-2012 Professor Benoit Macq
-	2003-2012 Antonin Descampe
-	2003-2009 Francois-Olivier Devaux
-	2005 Herve Drolon, FreeImage Team
-	2002-2003 Yannick Verschueren
-	2001-2003 David Janssens"
-LICENSE="BSD (2-clause)"
-REVISION="2"
-SOURCE_URI="http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz"
-CHECKSUM_SHA256="c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace"
-SOURCE_DIR="openjpeg-1.5.0"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	openjpeg$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:JPWL_image_to_j2k$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:JPWL_j2k_to_image$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:extract_j2k_from_mj2$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:frames_to_mj2$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:image_to_j2k$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:j2k_dump$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:j2k_to_image$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:jpip_to_j2k$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:jpip_to_jp2$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:mj2_to_frames$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:opj_dec_server$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:test_index$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	cmd:wrap_j2k_in_mj2$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	lib:libopenjpeg$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	lib:libopenjpeg_JPWL$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	lib:libopenjpip_local$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	openjpeg${secondaryArchSuffix}_devel = $portVersion compat >= 1.5.0
-	devel:libopenjpeg$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	devel:libopenjpeg_JPWL$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	devel:libopenjpip_local$secondaryArchSuffix = $portVersion compat >= 1.5.0
-	"
-REQUIRES_devel="
-	openjpeg$secondaryArchSuffix == $portVersion
-	"
-
-BUILD_REQUIRES="
-	devel:libz$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:autoconf
-	cmd:aclocal
-	cmd:autoreconf
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	./bootstrap.sh
-	runConfigure ./configure \
-		--enable-mj2 \
-		--enable-jpwl \
-		--enable-jpip
-	make
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libopenjpeg libopenjpip_local \
-	libopenjpeg_JPWL
-
-	fixPkgconfig
-
-	packageEntries devel $developDir
-}
diff --git a/media-libs/openjpeg/openjpeg-2.2.0.recipe b/media-libs/openjpeg/openjpeg-2.2.0.recipe
new file mode 100644
index 000000000..49dea3375
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.2.0.recipe
@@ -0,0 +1,89 @@
+SUMMARY="An open-source C-Library for JPEG 2000"
+DESCRIPTION="The OpenJPEG library is an open-source JPEG 2000 codec written \
+in C language. It has been developed in order to promote the use of JPEG \
+2000, the new still-image compression standard from the Joint Photographic \
+Experts Group (JPEG).
+In addition to the basic codec, various other features are under development, \
+among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool \
+useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer \
+for j2k-images."
+HOMEPAGE="http://www.openjpeg.org/"
+COPYRIGHT="2002-2014, Communications and Remote Sensing Laboratory, \
+Universite catholique de Louvain (UCL), Belgium
+	2002-2014 Professor Benoit Macq
+ 	2003-2014 Antonin Descampe
+ 	2003-2009 Francois-Olivier Devaux
+ 	2005 Herve Drolon, FreeImage Team
+ 	2002-2003 Yannick Verschueren
+	2001-2003 David Janssens
+	2011-2012, Centre National d'Etudes Spatiales (CNES), France
+	2012, CS Systemes d'Information, France"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="http://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz"
+SOURCE_FILENAME="openjpeg-$portVersion.tar.gz"
+CHECKSUM_SHA256="6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	openjpeg$secondaryArchSuffix = $portVersion
+	cmd:opj_decompress$secondaryArchSuffix = $portVersion
+	cmd:opj_compress$secondaryArchSuffix = $portVersion
+	cmd:opj_dump$secondaryArchSuffix = $portVersion
+	lib:libopenjp2$secondaryArchSuffix = 7.0.2 compat >= 7
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix >= 5
+	lib:libz$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	openjpeg${secondaryArchSuffix}_devel = $portVersion
+	devel:libopenjp2$secondaryArchSuffix = 7.0.2 compat >= 7
+	"
+REQUIRES_devel="
+	openjpeg$secondaryArchSuffix == $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libpng16$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix >= 5
+	devel:libz$secondaryArchSuffix
+	devel:liblcms2$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	mkdir -p build
+	cd build
+	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DOPENJPEG_INSTALL_BIN_DIR=$relativeBinDir \
+		-DOPENJPEG_INSTALL_LIB_DIR=$relativeLibDir \
+		-DOPENJPEG_INSTALL_INCLUDE_DIR=$relativeIncludeDir \
+		-DOPENJPEG_INSTALL_MAN_DIR=$relativeManDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	prepareInstalledDevelLib libopenjp2
+
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}