diff --git a/NEWS b/NEWS
index 8d941aae12b67ec806a26df931df3c4e8b97c051..f66e549a57975f98faa281457e2f358bdaaec6dc 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ documents those changes that are of interest to users and admins.
 =============================
  -- Modify sfree (BGL command) so that --all option no longer requires
     an argument.
+ -- Modify smap so it shows all nodes and partitions by default (even 
+    nodess that the user can't access, otherwise there are holes in 
+    its maps).
 
 * Changes in SLURM 0.6.0-pre4
 =============================
diff --git a/src/smap/partition_functions.c b/src/smap/partition_functions.c
index abf80503fd1e529df39b6f76dc8a78328c98dc1b..3dbd3f06303fd7e8f38decef844b3baf7707687b 100644
--- a/src/smap/partition_functions.c
+++ b/src/smap/partition_functions.c
@@ -81,7 +81,7 @@ extern void get_slurm_part()
 
 	if (part_info_ptr) {
 		error_code = slurm_load_partitions(part_info_ptr->last_update, 
-						   &new_part_ptr, 0);
+						   &new_part_ptr, SHOW_ALL);
 		if (error_code == SLURM_SUCCESS)
 			slurm_free_partition_info_msg(part_info_ptr);
 		else if (slurm_get_errno() == SLURM_NO_CHANGE_IN_DATA) {
@@ -90,7 +90,7 @@ extern void get_slurm_part()
 		}
 	} else {
 		error_code = slurm_load_partitions((time_t) NULL, 
-						   &new_part_ptr, 0);
+						   &new_part_ptr, SHOW_ALL);
 	}
 	if (error_code) {
 		if (quiet_flag != 1) {
@@ -169,7 +169,7 @@ extern void get_bgl_part()
 	
 	if (part_info_ptr) {
 		error_code = slurm_load_partitions(part_info_ptr->last_update, 
-						   &new_part_ptr, 0);
+						   &new_part_ptr, SHOW_ALL);
 		if (error_code == SLURM_SUCCESS)
 			slurm_free_partition_info_msg(part_info_ptr);
 		else if (slurm_get_errno() == SLURM_NO_CHANGE_IN_DATA) {
@@ -178,7 +178,7 @@ extern void get_bgl_part()
 		}
 	} else {
 		error_code = slurm_load_partitions((time_t) NULL, 
-						   &new_part_ptr, 0);
+						   &new_part_ptr, SHOW_ALL);
 	}
 
 	if (error_code) {
diff --git a/src/smap/smap.c b/src/smap/smap.c
index 1dadbf265448aac2b853853a25ece53b851debfa..062ae99a2f641c7cc9614ff3e0d11279f42000ba 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 	//char *name;	
 	log_init(xbasename(argv[0]), opts, SYSLOG_FACILITY_DAEMON, NULL);
 	parse_command_line(argc, argv);
-	while (slurm_load_node((time_t) NULL, &new_node_ptr, 0)) { 
+	while (slurm_load_node((time_t) NULL, &new_node_ptr, SHOW_ALL)) { 
 		error_code = slurm_get_errno();
 		printf("slurm_load_node: %s\n", slurm_strerror(error_code));
 		if (params.display == COMMANDS) {
@@ -254,7 +254,7 @@ part_fini:
 			if (node_info_ptr) {
 				error_code = slurm_load_node(
 					node_info_ptr->last_update, 
-					&new_node_ptr, 0);
+					&new_node_ptr, SHOW_ALL);
 				if (error_code == SLURM_SUCCESS)
 					slurm_free_node_info_msg(
 						node_info_ptr);
@@ -265,7 +265,7 @@ part_fini:
 				}
 			} else {
 				error_code = slurm_load_node((time_t) NULL, 
-							     &new_node_ptr, 0);
+						&new_node_ptr, SHOW_ALL);
 			}
 			if (error_code && (quiet_flag != 1)) {
 				if(!params.commandline) {