diff --git a/ChangeLog b/ChangeLog
index b7eb871b0..d93fc64c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-23 11:50-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Tools/sound/GNUmakefile: Fix circular dependency issue.
+	Added _INCLUDE_DIRS and _LIB_DIRS for each entry so that
+	it can build when GNUstep is not installed.
+
 2009-08-23 03:52-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* configure: Regenerate
diff --git a/Tools/sound/GNUmakefile b/Tools/sound/GNUmakefile
index 23ef52c09..cee7b6bbe 100644
--- a/Tools/sound/GNUmakefile
+++ b/Tools/sound/GNUmakefile
@@ -4,6 +4,21 @@ include $(GNUSTEP_MAKEFILES)/common.make
 BUNDLE_NAME = Sndfile AudioOutput
 BUNDLE_EXTENSION = .nssound
 
+# These are here in case GNUstep is not installed,
+# otherwise compilation will fail.
+Sndfile_INCLUDE_DIRS += -I../../Headers \
+        -I../../Headers/Additions
+
+Sndfile_LIB_DIRS += \
+	-L../../Source/$(GNUSTEP_OBJ_DIR)
+
+AudioOutput_INCLUDE_DIRS += -I../../Headers \
+        -I../../Headers/Additions
+
+AudioOutput_LIB_DIRS += \
+	-L../../Source/$(GNUSTEP_OBJ_DIR)
+
+# Build the bundles.
 Sndfile_OBJC_FILES = SndfileSource.m
 AudioOutput_OBJC_FILES = AudioOutputSink.m