diff --git a/media-libs/jbig2dec/jbig2dec-0.11.recipe b/media-libs/jbig2dec/jbig2dec-0.11.recipe
index 3103fbe4f..54bcc05b4 100644
--- a/media-libs/jbig2dec/jbig2dec-0.11.recipe
+++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe
@@ -1,26 +1,76 @@
-DESCRIPTION="jbig2dec is a decoder implementation of the JBIG2 image compression format" 
+SUMMARY="jbig2dec is a decoder implementation of the JBIG2 image format"
+DESCRIPTION="
+jbig2dec is a decoder implementation of the JBIG2 image compression
+format.  JBIG2 is designed for lossy or lossless encoding of
+'bilevel' (1-bit monochrome) images at moderately high resolution, and
+in particular scanned paper documents. In this domain it is very
+efficient, offering compression ratios on the order of 100:1."
 HOMEPAGE="http://jbig2dec.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/jbig2dec/files/jbig2dec/0.11/jbig2dec-0.11.tar.gz"
 CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="2001-2009 Artifex Software, Inc."
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	jbig2dec$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:jbig2dec$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libjbig2dec$secondaryArchSuffix = $portVersion compat >= 0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:m4
+	cmd:ar$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	jbig2dec${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libjbig2dec$secondaryArchSuffix = $portVersion compat >= 0
+	"
+
+REQUIRES_devel="
+	jbig2dec$secondaryArchSuffix == $portVersion
+	"
+
+PATCHES="jbig2dec-0.11.patchset"
+
+SOURCE_DIR="jbig2dec-0.11"
+
 BUILD()
 {
-	cd jbig2dec-0.11
 	libtoolize --force --copy --install
 	aclocal
+	automake --add-missing
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd jbig2dec-0.11
 	make install
-}
 
-LICENSE="GNU GPL v3"
-COPYRIGHT="2001-2009 Artifex Software, Inc."
+	prepareInstalledDevelLibs libjbig2dec
+
+	packageEntries devel $developDir
+}
diff --git a/media-libs/jbig2dec/patches/jbig2dec-0.11.patchset b/media-libs/jbig2dec/patches/jbig2dec-0.11.patchset
new file mode 100644
index 000000000..399e97892
--- /dev/null
+++ b/media-libs/jbig2dec/patches/jbig2dec-0.11.patchset
@@ -0,0 +1,22 @@
+From b90c4388ae17eb7198d0ef73b4772f2b13aa199b Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 17 Nov 2013 22:50:08 -0700
+Subject: Change macro to AC_CONFIG_HEADERS
+
+
+diff --git a/configure.ac b/configure.ac
+index e9dd8ee..6302f69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@ AC_PREREQ(2.53)
+ AC_CONFIG_SRCDIR([jbig2dec.c])
+ 
+ AM_INIT_AUTOMAKE([-Wall])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl Library versioning - Adapted from the libtool info page
+ dnl
+-- 
+1.8.3.4
+