diff --git a/media-libs/speex/patches/speex-1.2rc1.patch b/media-libs/speex/patches/speex-1.2rc1.patch
deleted file mode 100644
index 8950f992d..000000000
--- a/media-libs/speex/patches/speex-1.2rc1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN speex-1.2rc1/include/speex/speex_types.h speex-1.2rc1-haiku/include/speex/speex_types.h
---- speex-1.2rc1/include/speex/speex_types.h	2009-02-19 00:38:33.000000000 +0000
-+++ speex-1.2rc1-haiku/include/speex/speex_types.h	2009-02-19 00:35:50.000000000 +0000
-@@ -73,6 +73,15 @@
-    typedef int32_t spx_int32_t;
-    typedef u_int32_t spx_uint32_t;
- 
-+#elif defined(__HAIKU__)
-+
-+   /* Haiku */
-+#  include <sys/types.h>
-+   typedef short spx_int16_t;
-+   typedef unsigned short spx_uint16_t;
-+   typedef int spx_int32_t;
-+   typedef unsigned int spx_uint32_t;
-+
- #elif defined (__EMX__)
- 
-    /* OS/2 GCC */
diff --git a/media-libs/speex/patches/speex-1.2~rc1.patchset b/media-libs/speex/patches/speex-1.2~rc1.patchset
new file mode 100644
index 000000000..c979f0257
--- /dev/null
+++ b/media-libs/speex/patches/speex-1.2~rc1.patchset
@@ -0,0 +1,52 @@
+From 1342da5851b17b65e2fe12136cd854b47acc7452 Mon Sep 17 00:00:00 2001
+From: Scott McCreary <scottmc2@gmail.com>
+Date: Sat, 4 Sep 2010 06:59:30 +0000
+Subject: Speex patch to fix typedefs for Haiku build
+
+
+diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h
+index 852fed8..217bdfc 100644
+--- a/include/speex/speex_types.h
++++ b/include/speex/speex_types.h
+@@ -73,6 +73,15 @@
+    typedef int32_t spx_int32_t;
+    typedef u_int32_t spx_uint32_t;
+ 
++#elif defined(__HAIKU__)
++
++   /* Haiku */
++#  include <sys/types.h>
++   typedef short spx_int16_t;
++   typedef unsigned short spx_uint16_t;
++   typedef int spx_int32_t;
++   typedef unsigned int spx_uint32_t;
++
+ #elif defined (__EMX__)
+ 
+    /* OS/2 GCC */
+-- 
+1.7.5
+
+
+From 7ec1c5672675e7d89ab5b6d1d6550f7d04c7e688 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 17:15:15 +0200
+Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS
+
+
+diff --git a/configure.ac b/configure.ac
+index 057d888..9d0caec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
+ 
+ AC_INIT(libspeex/speex.c)
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ SPEEX_MAJOR_VERSION=1
+ SPEEX_MINOR_VERSION=1
+-- 
+1.7.5
+
diff --git a/media-libs/speex/speex-1.2rc1.recipe b/media-libs/speex/speex-1.2rc1.recipe
deleted file mode 100644
index 489052c8c..000000000
--- a/media-libs/speex/speex-1.2rc1.recipe
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION="Speex" 
-HOMEPAGE="http://www.speex.org" 
-SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
-CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.25
-	libogg > 1.3.0"
-BUILD()
-{
-	cd speex-1.2rc1
-	libtoolize --copy --force --install
-	aclocal
-	automake
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-				--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-				--docdir=$COMMON_DOCS/doc/speex \
-				--mandir=$COMMON_DOCS/man
-	make
-}
-
-INSTALL()
-{
-	cd speex-1.2rc1
-	make install
-}
-LICENSE="Speex"
-COPYRIGHT="2002-2009 Xiph.org Foundation
-	2002-2008 Jean-Marc Valin
-	2005-2007 Analog Devices Inc.
-	2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-	1993, 2002, 2006 David Rowe
-	2003 EpicGames
-	1992-1994 Jutta Degener, Carsten Bormann"
diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe
new file mode 100644
index 000000000..18bd26502
--- /dev/null
+++ b/media-libs/speex/speex-1.2~rc1.recipe
@@ -0,0 +1,82 @@
+SUMMARY="A Free Codec For Free Speech"
+DESCRIPTION="Speex is an Open Source/Free Software  patent-free audio compression format designed for speech. The Speex Project aims to lower the barrier of entry for voice applications by providing a free alternative to expensive proprietary speech codecs. Moreover, Speex is well-adapted to Internet applications and provides useful features that are not present in most other codecs. Finally, Speex is part of the GNU  Project and is available under the revised BSD license."
+HOMEPAGE="http://www.speex.org"
+LICENSE="Speex"
+COPYRIGHT="
+	2002-2009 Xiph.org Foundation
+	2002-2008 Jean-Marc Valin
+	2005-2007 Analog Devices Inc.
+	2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+	1993, 2002, 2006 David Rowe
+	2003 EpicGames
+	1992-1994 Jutta Degener, Carsten Bormann
+	"
+SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
+CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="speex-1.2~rc1.patchset"
+
+PROVIDES="
+	speex = $portVersion
+	cmd:speexdec = $portVersion
+	cmd:speexenc = $portVersion
+	lib:libspeex = 1.5.0 compat >= 1
+	lib:libspeexdsp = 1.5.0 compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libogg
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	devel:libogg
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="speex-1.2rc1"
+
+BUILD()
+{
+	libtoolize --copy --force --install
+	aclocal
+	automake
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libspeex libspeexdsp
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$dataDir/aclocal \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+SUMMARY_devel="The speex development files"
+PROVIDES_devel="
+	speex_devel = $portVersion
+	devel:libspeex = 1.5.0 compat >= 1
+	devel:libspeexdsp = 1.5.0 compat >= 1
+	"
+REQUIRES_devel="
+	speex == $portVersion
+	"