diff --git a/ChangeLog b/ChangeLog
index 5fca63b3..23c81055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 11:28:26 1998  Adam Fedor  <fedor@ultra.doc.com>
+
+	* ld_lib_path.sh: Add quotes around *_LIBRARY_PATH (patch from
+	doko@cs.tu-berlin.de (Matthias Klose)).
+
 Thu Sep  3 15:19:57 1998  Adam Fedor  <fedor@ultra.doc.com>
 
 	* configure.in: Check for DPS.
diff --git a/ld_lib_path.sh b/ld_lib_path.sh
index bad25b4a..cbdbf674 100755
--- a/ld_lib_path.sh
+++ b/ld_lib_path.sh
@@ -40,7 +40,7 @@ IFS="
 case "$host_os" in
 
   *nextstep4*)
-    if [ -z $DYLD_LIBRARY_PATH ]; then
+    if [ -z "$DYLD_LIBRARY_PATH" ]; then
 	DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part"
     else
 	DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$DYLD_LIBRARY_PATH"
@@ -55,7 +55,7 @@ case "$host_os" in
     ;;
 
   *)
-    if [ -z $LD_LIBRARY_PATH ]; then
+    if [ -z "$LD_LIBRARY_PATH" ]; then
 	LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part"
     else
 	LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$LD_LIBRARY_PATH"