diff --git a/mpd.changes b/mpd.changes
index feede0a..3fb9ab0 100644
--- a/mpd.changes
+++ b/mpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov  9 10:25:48 UTC 2018 - olaf@aepfle.de
+
+- Make iso9660 support optional (gh#173)
+
 -------------------------------------------------------------------
 Tue Oct 23 18:51:03 UTC 2018 - Luigi Baldoni <aloisio@gmx.com>
 
diff --git a/mpd.spec b/mpd.spec
index 7e35cbc..5e51a77 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -18,6 +18,7 @@
 
 
 %bcond_with    faad
+%bcond_without mpd_iso9660
 
 %if !%{defined _userunitdir}
 %define _userunitdir %{_prefix}/lib/systemd/user
@@ -86,7 +87,9 @@ BuildRequires:  pkgconfig(libavutil) >= 51.17
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libcurl) >= 7.18
 BuildRequires:  pkgconfig(libgme)
+%if %{with mpd_iso9660}
 BuildRequires:  pkgconfig(libiso9660)
+%endif
 BuildRequires:  pkgconfig(libmms) >= 0.4
 BuildRequires:  pkgconfig(libmodplug)
 BuildRequires:  pkgconfig(libmpdclient) >= 2.2
@@ -149,6 +152,7 @@ NOCONFIGURE=1 ./autogen.sh
 %configure \
         --disable-sidplay \
         --disable-aac \
+        --disable-iso9660 \
         \
     --enable-syslog \
     --enable-eventfd \
@@ -198,7 +202,9 @@ NOCONFIGURE=1 ./autogen.sh
     --enable-webdav \
     --enable-cue \
     --enable-neighbor-plugins \
+%if %{with mpd_iso9660}
     --enable-iso9660 \
+%endif
     --enable-zlib \
     --enable-bzip2 \
     --enable-upnp \