diff --git a/Makefile.am b/Makefile.am
index df554504f13e513280fcbeec46666a7424f9e92d..8c97afab2d6690b9e1f4c28d4b3e8cbd656c68de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,9 @@ EXTRA_DIST =			\
 	INSTALL			\
 	NEWS			\
 	ChangeLog		\
-	META
+	META			\
+	config.xml		\
+	configurator.html
 
 pkginclude_HEADERS =		\
 	slurm/bnr.h		\
diff --git a/NEWS b/NEWS
index d44e8e50bcb5267027e7f394e7b574f0273a222a..8d941aae12b67ec806a26df931df3c4e8b97c051 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,16 @@
 This file describes changes in recent versions of SLURM. It primarily
 documents those changes that are of interest to users and admins. 
 
+* Changes in SLURM 0.6.0-pre5
+=============================
+ -- Modify sfree (BGL command) so that --all option no longer requires
+    an argument.
+
 * Changes in SLURM 0.6.0-pre4
 =============================
  -- Added etc/slurm.epilog.clean to kill processes initiated outside of 
     slurm when a user's last job on a node terminates.
- -- Added config.xml file for use by OSCAR.
+ -- Added config.xml and configurator.html files for use by OSCAR.
  -- Increased maximum job step count from 64 to 130 for BGL systems only.
 
 * Changes in SLURM 0.6.0-pre3
diff --git a/src/plugins/select/bluegene/opts.c b/src/plugins/select/bluegene/opts.c
index 7b21c1f118b99060dab98dca69e66124e46940a4..d5588ef86cd5f935a1183f18977d18e46d256d38 100644
--- a/src/plugins/select/bluegene/opts.c
+++ b/src/plugins/select/bluegene/opts.c
@@ -41,12 +41,12 @@ void parse_command_line(int argc, char *argv[])
 	int option_index;
 	
 	static struct option long_options[] = {
-		{"all", required_argument, 0,       'a'},
-		{"bglblock", required_argument, 0,  'b'},
+		{"all",       no_argument,       0, 'a'},
+		{"bglblock",  required_argument, 0, 'b'},
 		{"partition", required_argument, 0, 'p'},
-		{"version", no_argument, 0,         'V'},
-		{"help", no_argument, 0,            'h'},
-		{"usage", no_argument, 0,           'u'},
+		{"version",   no_argument,       0, 'V'},
+		{"help",      no_argument,       0, 'h'},
+		{"usage",     no_argument,       0, 'u'},
 		{NULL, 0, 0, 0}
 	};