diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index fc7a46f556e..c2a798b4400 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -325,6 +325,9 @@ Release 0.23.2 - UNRELEASED
     MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job'
     whose tasks don't write any outputs. (Robert Joseph Evans via vinodkv)
 
+    MAPREDUCE-4005. Fixes broken AM container logs URL on ResourceManager
+    Application Info page. (Jason Lowe via sseth)
+
 Release 0.23.1 - 2012-02-17
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java
index f7f54aae3f1..47a263ded8d 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppInfo.java
@@ -118,7 +118,8 @@ public class AppInfo {
             this.amContainerLogsExist = true;
             String url = join("http://", masterContainer.getNodeHttpAddress(),
                 "/node", "/containerlogs/",
-                ConverterUtils.toString(masterContainer.getId()));
+                ConverterUtils.toString(masterContainer.getId()),
+                "/", app.getUser());
             this.amContainerLogs = url;
             this.amHostHttpAddress = masterContainer.getNodeHttpAddress();
           }
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
index 61012aa483f..2fbf3fdd864 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java
@@ -751,6 +751,8 @@ public class TestRMWebServicesApps extends JerseyTest {
         amHostHttpAddress);
     assertTrue("amContainerLogs doesn't match",
         amContainerLogs.startsWith("http://"));
+    assertTrue("amContainerLogs doesn't contain user info",
+        amContainerLogs.endsWith("/" + app.getUser()));
   }
 
 }