5 files changed, 8 insertions, 4 deletions
diff --git a/README.linux b/README.linux
index 893fb7ea2b..04af2da806 100644
--- a/README.linux
+++ b/README.linux
@@ -52,7 +52,7 @@ Build-Depends: debhelper (>= 7.0.50), quilt, python-support, cmake,
  libswscale-dev, liba52-dev, libdts-dev, libfaad-dev, libmp4ff-dev,
  libmpeg2-4-dev, libass-dev, libflac-dev, libwavpack-dev,
  python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev,
- zlib1g-dev, libmms-dev, libsmbclient-dev, libtiff4-dev
+ zlib1g-dev, libmms-dev, libsmbclient-dev, libtiff4-dev, libiso9660-dev
 
 *** For developers and anyone else who compiles frequently it is recommended to
 use ccache
diff --git a/README.ubuntu b/README.ubuntu
index 32e463fbe7..384ad716a7 100644
--- a/README.ubuntu
+++ b/README.ubuntu
@@ -41,7 +41,7 @@ Two methods exist to install the required Ubuntu packages :
 
 For Ubuntu (all versions >= 7.04):
 
-   # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev
+   # sudo aptitude install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev
 
 On 8.04 and older versions, libmms is outdated and thus XBMC will not compile properly.
 In this case you will have to manually compile the latest version.
diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
index 71dd615c2f..6e1633fccd 100644
--- a/xbmc/FileSystem/iso9660.cpp
+++ b/xbmc/FileSystem/iso9660.cpp
@@ -44,7 +44,11 @@ ISO9660
 #include "utils/CharsetConverter.h"
 
 #include "DetectDVDType.h"  // for MODE2_DATA_SIZE etc.
+#ifdef _LINUX
+#include <cdio/bytesex.h>
+#else
 #include "lib/libcdio/bytesex.h" // for from_723 & from_733
+#endif
 //#define _DEBUG_OUTPUT 1
 
 static CRITICAL_SECTION m_critSection;
diff --git a/xbmc/FileSystem/iso9660.h b/xbmc/FileSystem/iso9660.h
index 1d6d034431..afe28bab75 100644
--- a/xbmc/FileSystem/iso9660.h
+++ b/xbmc/FileSystem/iso9660.h
@@ -32,7 +32,7 @@
 typedef uint32_t iso723_t;
 typedef uint64_t iso733_t;
 #else
-#include "lib/libcdio/iso9660.h"
+#include <cdio/iso9660.h>
 #endif
 
 #pragma pack(1)
diff --git a/xbmc/utils/Makefile b/xbmc/utils/Makefile
index c3cb2c2739..af3a8a3e53 100644
--- a/xbmc/utils/Makefile
+++ b/xbmc/utils/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I.. -I../../ -I../linux -I../cores -I../../guilib -I../lib/libcdio/libcdio/include
+INCLUDES=-I. -I.. -I../../ -I../linux -I../cores -I../../guilib
 
 SRCS=AlarmClock.cpp \
      Archive.cpp \