diff --git a/CHANGES b/CHANGES
index f990652bcd..4a90f6b2c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.29-dev
 
+  *) Really reset the MaxClients value in worker when the
+     configured value is not a multiple of the number of threads
+     per child.  We said we did previously but we forgot to.
+     [Jeff Trawick]
+
   *) Add Debian layout.  [Daniel Stone <daniel@sfarc.net>]
 
   *) If shared modules are requested and mod_so is not available,
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 0ea7ae6d8f..97fbb34653 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1588,6 +1588,7 @@ static const char *set_server_limit (cmd_parms *cmd, void *dummy,
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                     " for a maximum of %d child processes,",
                     ap_daemons_limit);
+       max_clients = ap_daemons_limit * ap_threads_per_child; 
     }
     if (ap_daemons_limit > HARD_SERVER_LIMIT) {
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,