diff --git a/NEWS b/NEWS
index b28774e8c..027941a4d 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Changes in 1.8.6 (since 1.8.5)
 This makes these internal functions technically not callable from
 application code.
 
+** `guile-config link' now prints `-L$libdir' before `-lguile'
 ** Fix build issue on Tru64
 
 
diff --git a/guile-config/ChangeLog b/guile-config/ChangeLog
index 76d630ace..16063ebde 100644
--- a/guile-config/ChangeLog
+++ b/guile-config/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-02  Ludovic Courtès  <ludo@gnu.org>
+
+	* guile-config.in (build-link): Show `-L' before `-lguile'.
+	Reported by Peter O'Gorman <pogma@thewrittenword.com>.
+
 2008-01-22  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* COPYING: Removed.
diff --git a/guile-config/guile-config.in b/guile-config/guile-config.in
index e5687da46..b782292d8 100644
--- a/guile-config/guile-config.in
+++ b/guile-config/guile-config.in
@@ -4,7 +4,7 @@
 ;;;; guile-config --- utility for linking programs with Guile
 ;;;; Jim Blandy <jim@red-bean.com> --- September 1997
 ;;;; 
-;;;; 	Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -151,11 +151,11 @@
     (display (string-join
 	      (list
 	       (get-build-info 'CFLAGS)
-	       "-lguile -lltdl" 
                (if (or (string=? libdir "/usr/lib")
                        (string=? libdir "/usr/lib/"))
 		   ""
 		   (string-append "-L" (get-build-info 'libdir)))
+               "-lguile -lltdl"
 	       (string-join other-flags)
 
 	       )))