diff --git a/NEWS b/NEWS
index 13ec4a67a1a98e426113fc470f9ee991712c78a8..176b87a6d793c0151cfeb4a7855dabc6e7b60eda 100644
--- a/NEWS
+++ b/NEWS
@@ -20,8 +20,9 @@ documents those changes that are of interest to users and admins.
  -- JobAcct plugin renamed from "log" to "linux" in preparation for support of 
     new system types. 
     WARNING: "JobAcctType=jobacct/log" is no longer supported.
- -- removed vestigal 'bg' names from bluegene plugin and smap
-
+ -- Removed vestigal 'bg' names from bluegene plugin and smap
+ -- InactiveLimit parameter is not enforced for RootOnly partitions.
+ 
 * Changes in SLURM 1.1.0-pre2
 =============================
  -- Added basic "sbcast" support, still needs message fanout logic.
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index a580e4e20ea099f3319c2768061dd9986caf1011..4302ef256a48088783e380ea998a4bb75b13598d 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1,4 +1,4 @@
-.TH "slurm.conf" "5" "January 2006" "slurm.conf 1.1" "Slurm configuration file"
+.TH "slurm.conf" "5" "March 2006" "slurm.conf 1.1" "Slurm configuration file"
 .SH "NAME"
 slurm.conf \- Slurm configuration file 
 .SH "DESCRIPTION"
@@ -130,7 +130,11 @@ This limit permits defunct jobs to be purged in a timely fashion
 without waiting for their time limit to be reached.
 This value should reflect the possibility that the srun command may
 stopped by a debugger or considerable time could be required for batch 
-job pre- and post-processing. The default value is unlimited (zero). 
+job pre- and post-processing. 
+This limit is ignored for jobs running in partitions with the 
+\fBRootOnly\fR flag set (the scheduler running as root will be 
+responsible for the job).
+The default value is unlimited (zero). 
 May not exceed 65533.
 .TP
 \fBJobAcctType\fR
@@ -300,14 +304,14 @@ The port number on which slurmctld should listen for connection requests.
 This value is only used by the Maui Scheduler (see \fBSchedulerType\fR).
 .TP
 \fBSchedulerRootFilter\fR
-Identifies whether or not RootOnly partitions should be filtered from
+Identifies whether or not \fBRootOnly\fR partitions should be filtered from
 any external scheduling activities. Currently only used by the built-in
 backfill scheduling module "sched/backfill" (see \fBSchedulerType\fR).
 .TP
 \fBSchedulerRootFilter\fR
-Identifies whether or not RootOnly partitions should be filtered from
-any external scheduling activities. If set to 0, then RootOnly partitions
-are treated like any other partition. If set to 1, then RootOnly
+Identifies whether or not \fBRootOnly\fR partitions should be filtered from
+any external scheduling activities. If set to 0, then \fBRootOnly\fR partitions
+are treated like any other partition. If set to 1, then \fBRootOnly\fR
 partitions are exempt from any external scheduling activities. The
 default value is 1. Currently only used by the built-in backfill
 scheduling module "sched/backfill" (see \fBSchedulerType\fR).
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index d9f405996023a2d8b11e9c9394d78afa56ab735f..570f77503e91f1f7920cdfebc4b845ca03614778 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -2339,16 +2339,18 @@ void job_time_limit(void)
 		if (job_ptr->job_state != JOB_RUNNING)
 			continue;
 
-		if (slurmctld_conf.inactive_limit && 
-		    (job_ptr->time_last_active <= old)) {
+		if (slurmctld_conf.inactive_limit
+		&&  (job_ptr->time_last_active <= old)
+		&&  (job_ptr->part_ptr)
+		&&  (job_ptr->part_ptr->root_only == 0)) {
 			/* job inactive, kill it */
 			info("Inactivity time limit reached for JobId=%u",
 				job_ptr->job_id);
 			_job_timed_out(job_ptr);
 			continue;
 		}
-		if ((job_ptr->time_limit != INFINITE) &&
-		    (job_ptr->end_time <= now)) {
+		if ((job_ptr->time_limit != INFINITE)
+		&&  (job_ptr->end_time <= now)) {
 			last_job_update = now;
 			info("Time limit exhausted for JobId=%u",
 				job_ptr->job_id);