diff --git a/package/libcdio/Config.in b/package/libcdio/Config.in
index d2d61e7bd..555eb2915 100644
--- a/package/libcdio/Config.in
+++ b/package/libcdio/Config.in
@@ -1,11 +1,7 @@
 config BR2_PACKAGE_LIBCDIO
 	bool "libcdio"
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  The GNU Compact Disc Input and Control library.
 
 	  http://www.gnu.org/software/libcdio/
-
-comment "libcdio needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk
index b11480904..b9aec9e92 100644
--- a/package/libcdio/libcdio.mk
+++ b/package/libcdio/libcdio.mk
@@ -15,6 +15,10 @@ ifeq ($(BR2_ENABLE_LOCALE),)
 LIBCDIO_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_INSTALL_LIBSTDCPP),)
+LIBCDIO_CONF_OPT += --disable-cxx
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 LIBCDIO_DEPENDENCIES += ncurses
 else