diff --git a/dev-libs/libcdio/libcdio-0.94.recipe b/dev-libs/libcdio/libcdio-0.94.recipe
index 09d401a93..a0228466d 100644
--- a/dev-libs/libcdio/libcdio-0.94.recipe
+++ b/dev-libs/libcdio/libcdio-0.94.recipe
@@ -6,7 +6,7 @@ may benefit from using this library."
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
 COPYRIGHT="2002-2014 Rocky Bernstein and Herbert Valerio Riedel"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz"
 CHECKSUM_SHA256="96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a"
 PATCHES="libcdio-$portVersion.patchset"
diff --git a/dev-libs/libcdio/patches/libcdio-0.94.patchset b/dev-libs/libcdio/patches/libcdio-0.94.patchset
index 9035d9c13..e1ec03b6a 100644
--- a/dev-libs/libcdio/patches/libcdio-0.94.patchset
+++ b/dev-libs/libcdio/patches/libcdio-0.94.patchset
@@ -1,4 +1,4 @@
-From 3462988a94857e046cf0dc09e4fbeb6661457fa0 Mon Sep 17 00:00:00 2001
+From ec7550e64bd99890d91977ede7ec36b4faebef4e 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
@@ -41,10 +41,10 @@ index 29991e7..66b7a67 100644
  	    printf("-- Disc is %serasable.\n", b_erasable ? "" : "not ");
  	else
 -- 
-2.13.1
+2.14.3
 
 
-From 9d12e524359efaa19db8bd35a2ea0fc652104115 Mon Sep 17 00:00:00 2001
+From fbb4485e4292ac9ce8b52c95fbeae86ffdf1c103 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Fri, 12 Sep 2014 11:36:35 +0200
 Subject: Fix tests for gcc2.
@@ -70,5 +70,49 @@ index 235c5b4..f329f82 100644
  	     cwd, CDIO_FILE_SEPARATOR, fname);
      return result;
 -- 
-2.13.1
+2.14.3
+
+
+From 2af1bdaa4c314ee92fc265fc3202b2c37af514ce Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 5 Nov 2017 18:44:13 +0100
+Subject: Fix gcc2 build.
+
+
+diff --git a/src/getopt.c b/src/getopt.c
+index 80c7cb2..b601eb9 100644
+--- a/src/getopt.c
++++ b/src/getopt.c
+@@ -830,6 +830,14 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
+   {
+     char c = *d->__nextchar++;
+     char *temp = strchr (optstring, c);
++	char *nameend;
++	const struct option *p;
++	const struct option *pfound = NULL;
++	int exact = 0;
++	int ambig = 0;
++	int indfound = 0;
++	int option_index;
++
+ 
+     /* Increment `optind' when we start to process its last character.  */
+     if (*d->__nextchar == '\0')
+@@ -877,14 +885,6 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
+ 	if (longopts == NULL)
+ 	  goto no_longs;
+ 
+-	char *nameend;
+-	const struct option *p;
+-	const struct option *pfound = NULL;
+-	int exact = 0;
+-	int ambig = 0;
+-	int indfound = 0;
+-	int option_index;
+-
+ 	/* This is an option that requires an argument.  */
+ 	if (*d->__nextchar != '\0')
+ 	  {
+-- 
+2.14.3