diff --git a/NEWS b/NEWS
index b48badb56..91803bd8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.18.6 (not yet released)
+* input
+  - cdio_paranoia: support libcdio-paranoia 0.90
 
 ver 0.18.5 (2013/11/23)
 * configuration
diff --git a/configure.ac b/configure.ac
index 8d4f459e1..a7c18f784 100644
--- a/configure.ac
+++ b/configure.ac
@@ -749,6 +749,7 @@ MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
 if test x$enable_cdio_paranoia = xyes; then
 	AC_DEFINE([ENABLE_CDIO_PARANOIA], 1,
 		[Define to enable libcdio_paranoia support])
+	AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
 fi
 
 AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes)
diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index cc366bff5..3978ab9c5 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -41,7 +41,12 @@
 #include <glib.h>
 #include <assert.h>
 
+#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
+#include <cdio/parannoia/paranoia.h>
+#else
 #include <cdio/paranoia.h>
+#endif
+
 #include <cdio/cd_types.h>
 
 struct CdioParanoiaInputStream {