diff --git a/ChangeLog b/ChangeLog
index bed45ad6d..d745b90ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-24  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Fix setting ADDITIONAL_INCLUDE_... in
+	audiofile section.
+
 2003-07-23  Adam Fedor  <fedor@gnu.org>
 
 	* Version 0.8.8
diff --git a/configure b/configure
index cbb7341e8..e171e4ef6 100755
--- a/configure
+++ b/configure
@@ -3400,8 +3400,8 @@ fi
 done
 
   ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
-  ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS ${with_audiofile_include}"
-  ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS ${with_audiofile_library}"
+  ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS ${with_audiofile_include}"
+  ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS ${with_audiofile_library}"
   BUILD_GSND=gsnd
 fi
 
diff --git a/configure.ac b/configure.ac
index cb318c199..ae2ce8623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,8 +240,8 @@ AC_CHECK_LIB(audiofile, afGetVirtualFrameSize, audio_ok=yes, audio_ok=no)
 if test $audio_ok = yes -a $enable_gsnd = yes; then
   AC_CHECK_HEADERS(audiofile.h)
   ADDITIONAL_DEPENDS="$ADDITIONAL_DEPENDS -laudiofile"
-  ADDITIONAL_INCLUDE_DIRS="$GRAPHIC_CFLAGS ${with_audiofile_include}"
-  ADDITIONAL_LIB_DIRS="$GRAPHIC_LFLAGS ${with_audiofile_library}"
+  ADDITIONAL_INCLUDE_DIRS="$ADDITIONAL_INCLUDE_DIRS ${with_audiofile_include}"
+  ADDITIONAL_LIB_DIRS="$ADDITIONAL_LIB_DIRS ${with_audiofile_library}"
   BUILD_GSND=gsnd
 fi
 AC_SUBST(BUILD_GSND)