diff --git a/configure.in b/configure.in
index 6049ae8..f3dc197 100644
--- a/configure.in
+++ b/configure.in
@@ -111,11 +111,19 @@ if test "$glib" = yes; then
   fi
 fi
 
-AM_PATH_AUDIOFILE(
-  0.2.3,
-  AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
-  audiofile=yes
-)
+# Look for audiofile (default=yes)
+AC_MSG_CHECKING(whether to use audiofile)
+AC_ARG_WITH(audiofile,
+[  --without-audiofile     don't use audiofile],
+if test "$withval" = no; then audiofile=no; else audiofile=yes; fi,
+audiofile=yes)
+AC_MSG_RESULT($audiofile)
+if test "$audiofile" = yes; then
+  AM_PATH_AUDIOFILE(
+    0.2.3,
+    AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
+  )
+fi
 AM_CONDITIONAL(BUILD_AUDIOTOOLS, test "$audiofile" = yes)
 
 AC_OUTPUT(Makefile \
diff --git a/hacking/ChangeLog b/hacking/ChangeLog
index d42a76c..83e488d 100644
--- a/hacking/ChangeLog
+++ b/hacking/ChangeLog
@@ -237,3 +237,5 @@
          blocks, embedding loading screen and cassette inlays during
          conversion (Fred).
 20080512 tape2wav.c: add help text for rate option (Fred).
+20080614 configure.in: add --without-audiofile (patch #1982487)
+         (José Manuel Ferrer Ortiz).