diff --git a/dev-libs/libcdio/libcdio-2.0.0.recipe b/dev-libs/libcdio/libcdio-2.0.0.recipe
new file mode 100644
index 000000000..218b22be8
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.0.0.recipe
@@ -0,0 +1,123 @@
+SUMMARY="A library to encapsulate CD-ROM reading and control"
+DESCRIPTION="The libcdio package contains a library for CD-ROM and CD image \
+access. Applications wishing to be oblivious of the OS- and device-dependent \
+properties of a CD-ROM or of the specific details of various CD-image formats \
+may benefit from using this library."
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+COPYRIGHT="2002-2017 Rocky Bernstein and Herbert Valerio Riedel"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz
+	https://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.gz"
+CHECKSUM_SHA256="1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958"
+PATCHES="libcdio-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libcdioLibs="
+	libcdio
+	libcdioxx
+	libiso9660
+	libiso9660xx
+	libudf
+	"
+libcdioVersion=18.0.0
+libcdioxxVersion=1.0.0
+libiso9660Version=11.0.0
+libiso9660xxVersion=0.0.0
+libudfVersion=0.0.0
+for i in lib $libcdioLibs; do
+	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
+done
+
+PROVIDES="
+	libcdio$secondaryArchSuffix = $portVersion
+	lib:libcdio$secondaryArchSuffix = $libcdioVersionCompat
+	lib:libcdio++$secondaryArchSuffix = $libcdioxxVersionCompat
+	lib:libiso9660$secondaryArchSuffix = $libiso9660VersionCompat
+	lib:libiso9660++$secondaryArchSuffix = $libiso9660xxVersionCompat
+	lib:libudf$secondaryArchSuffix = $libudfVersionCompat
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:cdda_player = $portVersion
+		cmd:cd_drive = $portVersion
+		cmd:cd_info = $portVersion
+		cmd:cd_read = $portVersion
+		cmd:iso_info = $portVersion
+		cmd:iso_read = $portVersion
+		cmd:mmc_tool = $portVersion
+		"
+fi
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcddb$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libcdio${secondaryArchSuffix}_devel = $portVersion
+	devel:libcdio$secondaryArchSuffix = $libcdioVersionCompat
+	devel:libcdio++$secondaryArchSuffix = $libcdioxxVersionCompat
+	devel:libiso9660$secondaryArchSuffix = $libiso9660VersionCompat
+	devel:libiso9660++$secondaryArchSuffix = $libiso9660xxVersionCompat
+	devel:libudf$secondaryArchSuffix = $libudfVersionCompat
+	"
+REQUIRES_devel="
+	libcdio$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcddb$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:automake
+	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage libcdio$secondaryArchSuffix \
+	"$libDir"/libcdio.so.$libcdioVersion \
+	"$libDir"/libcdio++.so.$libcdioxxVersion \
+	"$libDir"/libiso9660.so.$libiso9660Version \
+	"$libDir"/libiso9660++.so.$libiso9660xxVersion \
+	"$libDir"/libudf.so.$libudfVersion \
+
+BUILD()
+{
+	autoreconf -vfi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm -f "$libDir"/lib*.la
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf "$documentationDir" "$binDir"
+	fi
+
+	# set up the develop directory correctly
+	prepareInstalledDevelLibs ${libcdioLibs//xx/++}
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		"$developDir"
+}
+
+TEST()
+{
+	make check
+}
diff --git a/dev-libs/libcdio/libcdio-0.94.recipe b/dev-libs/libcdio/libcdio0-0.94.recipe
similarity index 82%
rename from dev-libs/libcdio/libcdio-0.94.recipe
rename to dev-libs/libcdio/libcdio0-0.94.recipe
index a0228466d..e8b81655a 100644
--- a/dev-libs/libcdio/libcdio-0.94.recipe
+++ b/dev-libs/libcdio/libcdio0-0.94.recipe
@@ -6,9 +6,11 @@ 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="2"
-SOURCE_URI="http://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz"
+REVISION="1"
+SOURCE_URI="https://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz
+	https://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.gz"
 CHECKSUM_SHA256="96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a"
+SOURCE_DIR="libcdio-$portVersion"
 PATCHES="libcdio-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -16,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 
 PROVIDES="
-	libcdio$secondaryArchSuffix = $portVersion
+	libcdio0$secondaryArchSuffix = $portVersion
 	lib:libcdio$secondaryArchSuffix = 16.0.0 compat >= 16
 	lib:libcdio++$secondaryArchSuffix = 0.0.2 compat >= 0
 	lib:libiso9660$secondaryArchSuffix = 10.0.0 compat >= 10
@@ -39,9 +41,12 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	"
+CONFLICTS="
+	libcdio$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	libcdio${secondaryArchSuffix}_devel = $portVersion
+	libcdio0${secondaryArchSuffix}_devel = $portVersion
 	devel:libcdio${secondaryArchSuffix} = 16.0.0 compat >= 16
 	devel:libcdio++${secondaryArchSuffix} = 0.0.2 compat >= 0
 	devel:libiso9660${secondaryArchSuffix} = 10.0.0 compat >= 10
@@ -49,7 +54,10 @@ PROVIDES_devel="
 	devel:libudf${secondaryArchSuffix} = 0.0.0 compat >= 0
 	"
 REQUIRES_devel="
-	libcdio${secondaryArchSuffix} == $portVersion base
+	libcdio0$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libcdio${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
@@ -58,20 +66,17 @@ BUILD_REQUIRES="
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
+	cmd:automake
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:autoconf
-	cmd:automake
+	cmd:make
 	"
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	automake
+	autoreconf -vfi
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/dev-libs/libcdio/patches/libcdio-0.94.patchset b/dev-libs/libcdio/patches/libcdio-0.94.patchset
index e1ec03b6a..f7748cd69 100644
--- a/dev-libs/libcdio/patches/libcdio-0.94.patchset
+++ b/dev-libs/libcdio/patches/libcdio-0.94.patchset
@@ -116,3 +116,56 @@ index 80c7cb2..b601eb9 100644
 -- 
 2.14.3
 
+
+From 9a51b8bffddaebf5ecef4dc002704cde56de8ca5 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Mon, 27 Aug 2018 19:01:36 +0200
+Subject: fix gcc2 test for bincue.c
+
+
+diff --git a/test/driver/bincue.c b/test/driver/bincue.c
+index 9c0ece4..af548c2 100644
+--- a/test/driver/bincue.c
++++ b/test/driver/bincue.c
+@@ -119,6 +119,7 @@ main(int argc, const char *argv[])
+     } else {
+       /* Just test performing some operations. */
+       cdio_set_blocksize(p_cdio, 2048);
++      {
+       char *psz_device;
+ 
+ #ifdef HAVE_CHDIR
+@@ -143,6 +144,7 @@ main(int argc, const char *argv[])
+       }
+ 
+       cdio_destroy(p_cdio);
++      }
+ 
+     }
+     
+-- 
+2.16.4
+
+
+From 8f7c8cdc2c25b80070886a6e8102643e5ccd7204 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 31 Aug 2018 18:46:24 +0200
+Subject: fix realpath for the test
+
+
+diff --git a/configure.ac b/configure.ac
+index 6095b44..7600617 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -558,7 +558,7 @@ AC_SUBST(LIBCDIO_SOURCE_PATH)
+ AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \
+ 		 getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \
+ 		 seteuid setegid snprintf setenv strndup unsetenv tzset sleep \
+-		 _stati64 usleep vsnprintf readlink realpath gmtime_r localtime_r] )
++		 _stati64 usleep vsnprintf readlink gmtime_r localtime_r] )
+ 
+ # check for timegm() support
+ AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,
+-- 
+2.16.4
+
diff --git a/dev-libs/libcdio/patches/libcdio-2.0.0.patchset b/dev-libs/libcdio/patches/libcdio-2.0.0.patchset
new file mode 100644
index 000000000..18bf1a545
--- /dev/null
+++ b/dev-libs/libcdio/patches/libcdio-2.0.0.patchset
@@ -0,0 +1,74 @@
+From 13e5603c9b1a53bacdd52a0ea42fc4680591aae9 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Apr 2014 21:36:18 +0000
+Subject: Fix gcc2 build.
+
+
+diff --git a/configure.ac b/configure.ac
+index f8f7f7d..dc352ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,7 +260,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
+@@ -645,7 +645,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/lib/driver/abs_path.c b/lib/driver/abs_path.c
+index 2b62956..f3905c8 100644
+--- a/lib/driver/abs_path.c
++++ b/lib/driver/abs_path.c
+@@ -93,11 +93,13 @@ cdio_dirname(const char *fname)
+ char *
+ cdio_abspath(const char *cwd, const char *fname)
+ {
++    size_t len;
++    char* result;
+     if (isdirsep(*fname))
+       return strdup(fname);
+     else {
+-      size_t len   = strlen(cwd) + strlen(fname) + 2;
+-      char* result = calloc(sizeof(char), len);
++      len   = strlen(cwd) + strlen(fname) + 2;
++      result = calloc(sizeof(char), len);
+       snprintf(result, len, "%s%c%s",
+ 	       cwd, CDIO_FILE_SEPARATOR, fname);
+       return result;
+-- 
+2.16.4
+
+
+From 7d70318dbf4ec6981ebc51a41e2c87045c92b9aa Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 31 Aug 2018 18:46:24 +0200
+Subject: fix realpath for the test
+
+
+diff --git a/configure.ac b/configure.ac
+index dc352ab..7486cfd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -565,7 +565,7 @@ AC_SUBST(LIBCDIO_SOURCE_PATH)
+ AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \
+ 		 getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \
+ 		 seteuid setegid snprintf setenv strndup unsetenv tzset sleep \
+-		 _stati64 usleep vsnprintf readlink realpath gmtime_r localtime_r] )
++		 _stati64 usleep vsnprintf readlink gmtime_r localtime_r] )
+ 
+ # check for timegm() support
+ AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,
+-- 
+2.16.4
+