diff --git a/NEWS b/NEWS
index a84f5d9ef..8f01109f6 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ lead to a stack overflow.
 ** Fixed build issue with DEC/Compaq/HP's compiler
 ** Fixed `scm_from_complex_double' build issue on FreeBSD
 ** Fixed `alloca' build issue on FreeBSD 6
+** Fixed shadowing of libc's <random.h> on Tru64, which broke compilation
 ** Make sure all tests honor `$TMPDIR'
 
 * Changes to the distribution
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 9b72781b6..c4f5f1718 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-24  Ludovic Courtès  <ludo@gnu.org>
+
+	* Makefile.am (DEFAULT_INCLUDES): New.  Fixes compilation on
+	Tru64 where our "random.h" would shadown libc's one.
+	(INCLUDES): Add "-I$(top_buildir)", which is normally in
+	`DEFAULT_INCLUDES'.
+	* gen-scmconfig.c: Include <libguile/gen-scmconfig.h>, not
+	"gen-scmconfig.h" since that file is under `$(builddir)'.
+
 2008-04-16  Ludovic Courtès  <ludo@gnu.org>
 
 	Copy Han-Wen's srcprop reimplementation from the 1.9 branch,
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 864700e92..7944e6d34 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -23,10 +23,16 @@ AUTOMAKE_OPTIONS = gnu
 
 ## Prevent automake from adding extra -I options
 DEFS = @DEFS@
+
+# Override Automake's `DEFAULT_INCLUDES'.  By default, it contains
+# "-I$(srcdir)", which causes problems on Tru64 where our "random.h"
+# is picked up by <stdlib.h> instead of the libc's <random.h>.
+DEFAULT_INCLUDES =
+
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.
-INCLUDES = -I.. -I$(top_srcdir)
+INCLUDES = -I.. -I$(top_srcdir) -I$(top_builddir)
 
 ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
    --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index 6afa72fcc..788b45144 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -121,7 +121,7 @@
 #  include <config.h>
 #endif
 
-#include "gen-scmconfig.h"
+#include <libguile/gen-scmconfig.h>
 
 #include <stdio.h>
 #include <string.h>