diff --git a/src/CHANGELOG b/src/CHANGELOG
index 3354a182d..92318af20 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -101,6 +101,10 @@ ECL 0.9k:
    thanks to a more clever use of declarations __declspec(dllexport) and
    __declspec(dllimport).
 
+ - We no longer use the flag --rpath when building ECL. Given the fact that
+   ECL now assumes a standard Unix filesystem structure, this should pose no
+   problem. For nonstandard locations, you will have to define LD_LIBRARY_PATH
+
 * System design:
 
  - We introduce a new kind of lisp objects, the stack frames. These are objects
diff --git a/src/cmp/cmpdefs.lsp b/src/cmp/cmpdefs.lsp
index 123aca309..7c7cfcc87 100644
--- a/src/cmp/cmpdefs.lsp
+++ b/src/cmp/cmpdefs.lsp
@@ -429,16 +429,16 @@ coprocessor).")
                     #+msvc "~A ~A ~:[~*~;~A~] -I\"~A\" -w -c \"~A\" -Fo\"~A\"")
 
 #-dlopen
-(defvar *ld-flags* "@LDRPATH@ @LDFLAGS@ -lecl @CORE_LIBS@ @LIBS@ @FASL_LIBS@")
+(defvar *ld-flags* "@LDFLAGS@ -lecl @CORE_LIBS@ @LIBS@ @FASL_LIBS@")
 #+dlopen
-(defvar *ld-flags* #-msvc "@LDRPATH@ @LDFLAGS@ -lecl @LIBS@ @FASL_LIBS@"
-                   #+msvc "@LDRPATH@ @LDFLAGS@ ecl.lib @CLIBS@")
+(defvar *ld-flags* #-msvc "@LDFLAGS@ -lecl @LIBS@ @FASL_LIBS@"
+                   #+msvc "@LDFLAGS@ ecl.lib @CLIBS@")
 #+dlopen
-(defvar *ld-shared-flags* #-msvc "@LDRPATH@ @SHARED_LDFLAGS@ @LDFLAGS@ -lecl @LIBS@ @FASL_LIBS@"
-                          #+msvc "@LDRPATH@ @SHARED_LDFLAGS@ @LDFLAGS@ ecl.lib @CLIBS@")
+(defvar *ld-shared-flags* #-msvc "@SHARED_LDFLAGS@ @LDFLAGS@ -lecl @LIBS@ @FASL_LIBS@"
+                          #+msvc "@SHARED_LDFLAGS@ @LDFLAGS@ ecl.lib @CLIBS@")
 #+dlopen
-(defvar *ld-bundle-flags* #-msvc "@LDRPATH@ @BUNDLE_LDFLAGS@ @LDFLAGS@ -lecl @LIBS@ @FASL_LIBS@"
-                          #+msvc "@LDRPATH@ @BUNDLE_LDFLAGS@ @LDFLAGS@ ecl.lib @CLIBS@")
+(defvar *ld-bundle-flags* #-msvc "@BUNDLE_LDFLAGS@ @LDFLAGS@ -lecl @LIBS@ @FASL_LIBS@"
+                          #+msvc "@BUNDLE_LDFLAGS@ @LDFLAGS@ ecl.lib @CLIBS@")
 
 (defvar +shared-library-prefix+ "@SHAREDPREFIX@")
 (defvar +shared-library-extension+ "@SHAREDEXT@")
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index a6f3de93b..f3932fa94 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -82,7 +82,7 @@
 	   (si::coerce-to-filename o-pathname)
 	   (fix-for-mingw (ecl-library-directory))
 	   options
-	   *ld-flags* (fix-for-mingw (ecl-library-directory)))))
+	   *ld-flags*)))
 
 #+dlopen
 (defun shared-cc (o-pathname &rest options)
@@ -94,7 +94,7 @@
 	   (si::coerce-to-filename o-pathname)
 	   (fix-for-mingw (ecl-library-directory))
 	   options
-	   *ld-shared-flags* (fix-for-mingw (ecl-library-directory))))
+	   *ld-shared-flags*))
   #+(or mingw32)
   (let ((lib-file (compile-file-pathname o-pathname :type :lib)))
     (safe-system
@@ -103,8 +103,7 @@
 	     (si::coerce-to-filename o-pathname)
 	     (fix-for-mingw (ecl-library-directory))
 	     options
-	     *ld-shared-flags*
-	     (fix-for-mingw (ecl-library-directory))))))
+	     *ld-shared-flags*))))
 
 #+dlopen
 (defun bundle-cc (o-pathname init-name &rest options)
@@ -118,8 +117,7 @@
 	   options
 	   #-msvc *ld-bundle-flags*
 	   #+msvc (concatenate 'string *ld-bundle-flags* " /EXPORT:"
-			       init-name)
-	   (ecl-library-directory)))
+			       init-name)))
   #+(or mingw32)
   (safe-system
    (format nil
@@ -127,8 +125,7 @@
 	   (si::coerce-to-filename o-pathname)
 	   (fix-for-mingw (ecl-library-directory))
 	   options
-	   *ld-bundle-flags*
-	   (fix-for-mingw (ecl-library-directory)))))
+	   *ld-bundle-flags*)))
 
 (defconstant +lisp-program-header+ "
 #include <ecl/ecl.h>
diff --git a/src/compile.lsp.in b/src/compile.lsp.in
index 519e2acf6..7dff27025 100644
--- a/src/compile.lsp.in
+++ b/src/compile.lsp.in
@@ -48,18 +48,18 @@
       "@LDFLAGS@ @LDRPATH@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@")
 #+(and :wants-dlopen (not nonstop))
 (setf c::*ld-flags*
-      "@LDFLAGS@ @LDRPATH@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@"
+      "@LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@"
       c::*ld-shared-flags*
-      "@LDRPATH@ @SHARED_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@"
+      "@SHARED_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@"
       c::*ld-bundle-flags*
-      "@LDRPATH@ @BUNDLE_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@")
+      "@BUNDLE_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@")
 #+(and :wants-dlopen nonstop)
 (setf c::*ld-flags*
-      "@LDFLAGS@ @LDRPATH@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@"
+      "@LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@"
       c::*ld-shared-flags*
-      "@LDRPATH@ @SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@"
+      "@SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@"
       c::*ld-bundle-flags*
-      "@LDRPATH@ @BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@")
+      "@BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@")
 
 ;;;
 ;;; * Avoid name clashes with user supplied code.
diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index 9e02b7f2d..2851aaddf 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -24,7 +24,7 @@ Returns, as a string, the location of the machine on which ECL runs."
 (defun lisp-implementation-version ()
   "Args:()
 Returns the version of your ECL as a string."
-  "@PACKAGE_VERSION@ (CVS 2008-03-17 17:51)")
+  "@PACKAGE_VERSION@ (CVS 2008-03-18 22:50)")
 
 (defun machine-type ()
   "Args: ()