diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 3c78afd8669cbbf146eef076e008763c5896e87b..5b5fc4ca638a0c03e9ec971cd9a274932dd63726 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -219,7 +219,7 @@ Acceptable values include
 "select/linear" for a one-dimentional array of nodes in which 
 sequentially ordered nodes are preferable, and
 "select/bluegene" for a three-dimentional Blue Gene system. 
-The default value is "select/bgl" for Blue Gene systems 
+The default value is "select/bluegene" for Blue Gene systems 
 and "select/linear" for all other systems.
 .TP
 \fBSlurmUser\fR
diff --git a/src/common/read_config.h b/src/common/read_config.h
index 3eda63edbf941523cfd85dab4029f2fa065ab23d..2e7df1275ecded2bf3a9bcbbbdc095af5e47d783 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -45,7 +45,11 @@
 #define DEFAULT_RETURN_TO_SERVICE   0
 #define DEFAULT_SAVE_STATE_LOC      "/tmp"
 #define DEFAULT_SCHEDTYPE           "sched/builtin"
-#define DEFAULT_SELECT_TYPE           "select/linear"
+#ifdef HAVE_BGL
+#define DEFAULT_SELECT_TYPE         "select/bluegene"
+#else
+#define DEFAULT_SELECT_TYPE         "select/linear"
+#endif
 #define DEFAULT_SLURMCTLD_PIDFILE   "/var/run/slurmctld.pid"
 #define DEFAULT_SLURMCTLD_TIMEOUT   120
 #define DEFAULT_SLURMD_PIDFILE      "/var/run/slurmd.pid"