diff --git a/NEWS b/NEWS
index 24bfa26c2413c87d9acb5f9c4c8a4ac02e1fb5f8..c9d36359a030303b549cdc8e098c4542a74614b3 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ documents those changes that are of interest to users and admins.
     calling interconnect_postfini() to insure no processes escape from 
     job and prevent switch windows from being released.
  -- Added mail.html web page telling how to get on slurm mailing lists.
+ -- Added another directory to search for DB2 files on BGL system.
+ -- Added overview man page slurm.1.
 
 * Changes in SLURM 0.5.0-pre3
 =============================
diff --git a/auxdir/x_ac_bgl.m4 b/auxdir/x_ac_bgl.m4
index 2bc54394896e8ff7dbea52f328f8ea9693ebe130..11047f6da9403e59128f4d1e0a4d54a839518e14 100644
--- a/auxdir/x_ac_bgl.m4
+++ b/auxdir/x_ac_bgl.m4
@@ -14,7 +14,7 @@
 
 AC_DEFUN([X_AC_BGL],
 [
-   bgl_default_dirs="/bgl/BlueLight/ppcfloor/bglsys /home/bgdb2cli/sqllib"
+   bgl_default_dirs="/bgl/BlueLight/ppcfloor/bglsys /home/bgdb2cli/sqllib /u/bgdb2cli/sqllib"
 
    for bgl_dir in $bgl_default_dirs; do
       # Skip directories that don't exist
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index c7a5187786f3e96c216a5e7b6024535db21abdf7..e35f82aeab07157e8c66b8f1798b80c83d5935ad 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -8,6 +8,7 @@ man1_MANS =            \
 	man1/sinfo.1   \
 	man1/squeue.1  \
 	man1/srun.1 \
+	man1/slurm.1 \
 	man1/smap.1   
 
 man3_MANS = man3/slurm_hostlist_create.3 \
diff --git a/doc/man/man1/slurm.1 b/doc/man/man1/slurm.1
new file mode 100644
index 0000000000000000000000000000000000000000..b908565f8fef74400f49286a1b1517b07476c4e4
--- /dev/null
+++ b/doc/man/man1/slurm.1
@@ -0,0 +1,60 @@
+.TH SLURM "1" "May 2005" "slurm 0.5" "Slurm system"
+
+.SH "NAME"
+slurm \- SLURM system overview.
+
+.SH "DESCRIPTION"
+The Simple Linux Utility for Resource Management (SLURM) is an open source,
+fault-tolerant, and highly scalable cluster management and job scheduling system 
+for large and small Linux clusters. SLURM requires no kernel modifications for
+its operation and is relatively self-contained. As a cluster resource manager,
+SLURM has three key functions. First, it allocates exclusive and/or non-exclusive 
+access to resources (compute nodes) to users for some duration of time so they
+can perform work. Second, it provides a framework for starting, executing, and
+monitoring work (normally a parallel job) on the set of allocated nodes. Finally, 
+it arbitrates conflicting requests for resources by managing a queue of pending
+work.
+
+SLURM has a centralized manager, \fBslurmctld\fR, to monitor resources and
+work. There may also be a backup manager to assume those responsibilities in the 
+event of failure. Each compute server (node) has a \fBslurmd\fR daemon, which
+can be compared to a remote shell: it waits for work, executes that work, returns 
+status, and waits for more work. 
+
+User tools include \fBsrun\fR to initiate jobs, 
+\fBscancel\fR to terminate queued or running jobs, \fBsinfo\fR to report system 
+status, and \fBsqueue\fR to report the status of jobs. There is also an administrative
+tool \fBscontrol\fR available to monitor and/or modify configuration and state
+information. APIs are available for all functions.
+
+SLURM configuration is maintained in the \fBslurm.conf\fR file.
+
+Man pages are available for all SLURM commands, daemons, APIs, plus the 
+\fBslurm.conf\fR file.
+Extensive documenation is also available on the internet at
+\fB<http://www.llnl.gov/linux/slurm/>\fR.
+
+.SH "COPYING"
+Copyright (C) 2005 The Regents of the University of California.
+Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+UCRL-CODE-2002-040.
+.LP
+This file is part of SLURM, a resource management program.
+For details, see <http://www.llnl.gov/linux/slurm/>.
+.LP
+SLURM is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+.LP
+SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details.
+
+.SH "SEE ALSO"
+\fBscancel\fR(1), \fBscontrol\fR(1), \fBsinfo\fR(1), \fBsmap\fR(1), 
+\fBsqueue\fR(1), \fBsrun\fR(1), 
+\fBslurm.conf\fR(5),
+\fBslurmctld\fR(8), \fBslurmd\fR(8)
+