diff --git a/dev-libs/libcdio/libcdio-0.92.recipe b/dev-libs/libcdio/libcdio-0.92.recipe
index fae269b95..50283d100 100644
--- a/dev-libs/libcdio/libcdio-0.92.recipe
+++ b/dev-libs/libcdio/libcdio-0.92.recipe
@@ -16,6 +16,8 @@ REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+PATCHES="libcdio-0.92.patchset"
+
 PROVIDES="
 	libcdio$secondaryArchSuffix = $portVersion
 	cmd:cdda_player
diff --git a/dev-libs/libcdio/patches/libcdio-0.82.patch b/dev-libs/libcdio/patches/libcdio-0.82.patch
deleted file mode 100644
index 4a63b6636..000000000
--- a/dev-libs/libcdio/patches/libcdio-0.82.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN libcdio-0.82/configure.ac libcdio-0.82-haiku/configure.ac
---- libcdio-0.82/configure.ac	2009-10-27 11:26:32.055574528 +0000
-+++ libcdio-0.82-haiku/configure.ac	2010-10-05 11:54:28.000000000 +0000
-@@ -246,7 +246,7 @@
- dnl empty_array_size
- AC_MSG_CHECKING([how to create empty arrays])
- 
--empty_array_size="xxxx"
-+empty_array_size="xxx"
- AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
- 
- if test "x$empty_array_size" = "xxxx";then
-@@ -572,6 +572,7 @@
-     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
-     HAVE_CDDB=no])
-     AC_CHECK_LIB(socket, connect)
-+    AC_CHECK_LIB(network, connect)
-     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
- fi
- 
diff --git a/dev-libs/libcdio/patches/libcdio-0.83.patch b/dev-libs/libcdio/patches/libcdio-0.83.patch
deleted file mode 100644
index 4f1ed285f..000000000
--- a/dev-libs/libcdio/patches/libcdio-0.83.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN libcdio-0.83/configure.ac libcdio-0.83-haiku/configure.ac
---- libcdio-0.83/configure.ac	2009-10-27 11:26:32.055574528 +0000
-+++ libcdio-0.83-haiku/configure.ac	2010-10-05 11:54:28.000000000 +0000
-@@ -246,7 +246,7 @@
- dnl empty_array_size
- AC_MSG_CHECKING([how to create empty arrays])
- 
--empty_array_size="xxxx"
-+empty_array_size="xxx"
- AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
- 
- if test "x$empty_array_size" = "xxxx";then
-@@ -572,6 +572,7 @@
-     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
-     HAVE_CDDB=no])
-     AC_CHECK_LIB(socket, connect)
-+    AC_CHECK_LIB(network, connect)
-     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
- fi
- 
diff --git a/dev-libs/libcdio/patches/libcdio-0.92.patchset b/dev-libs/libcdio/patches/libcdio-0.92.patchset
new file mode 100644
index 000000000..ebeacb701
--- /dev/null
+++ b/dev-libs/libcdio/patches/libcdio-0.92.patchset
@@ -0,0 +1,45 @@
+From 0773ee4a7e18c12b02a7e83fca1c3f9796f61e73 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Apr 2014 21:36:18 +0000
+Subject: gcc2 build fix
+
+
+diff --git a/configure.ac b/configure.ac
+index d83b885..de089f1 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,7 +241,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ dnl empty_array_size
+ AC_MSG_CHECKING([how to create empty arrays])
+ 
+-empty_array_size="xxxx"
++empty_array_size="xxx"
+ AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
+ 
+ if test "x$empty_array_size" = "xxxx"; then
+@@ -623,6 +623,7 @@ if test "x$enable_cddb" != "xno"; then
+     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
+     HAVE_CDDB=no])
+     AC_CHECK_LIB(socket, connect)
++    AC_CHECK_LIB(network, connect)
+     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
+ fi
+ 
+diff --git a/example/mmc1.c b/example/mmc1.c
+index 29991e7..66b7a67 100644
+--- a/example/mmc1.c
++++ b/example/mmc1.c
+@@ -90,9 +90,9 @@ main(int argc, const char *argv[])
+     {
+ 	driver_return_code_t i_status;
+ 	bool b_erasable;
++	cdio_mmc_feature_profile_t disctype;
+ 
+ 	i_status = mmc_get_disc_erasable(p_cdio, &b_erasable);
+-	cdio_mmc_feature_profile_t disctype;
+ 	if (DRIVER_OP_SUCCESS == i_status)
+ 	    printf("-- Disc is %serasable.\n", b_erasable ? "" : "not ");
+ 	else
+-- 
+1.8.3.4
+