diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index df3a226aca..0e136d171c 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -105,5 +105,10 @@ public class FileParameterValue extends ParameterValue {
 			return false;
 		return true;
 	}
+	
+	@Override
+    public String toString() {
+    	return "(FileParameterValue) " + getName() + "='" + file.getName() + "'";
+    }
     
 }
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index d872755bf6..2a5cdeab5b 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -30,6 +30,7 @@ import hudson.Util;
 import hudson.XmlFile;
 import hudson.remoting.AsyncFutureImpl;
 import hudson.model.Node.Mode;
+import hudson.model.ParametersAction;
 import hudson.triggers.SafeTimerTask;
 import hudson.triggers.Trigger;
 import hudson.util.OneShotEvent;
@@ -1145,7 +1146,25 @@ public class Queue extends ResourceController implements Saveable {
          */
         @Exported
         public abstract String getWhy();
-
+        
+        /**
+         * Gets a human-readable message about the parameters of this item
+         * @return String
+         */
+        @Exported
+        public String getParams() {
+        	String s = "";
+        	for(Action action : getActions()) {
+        		if(action instanceof ParametersAction) {
+        			ParametersAction pa = (ParametersAction)action;
+        			for (ParameterValue p : pa.getParameters()) {
+        				s = s + "<br>" + p.toString();
+        			}
+        		}
+        	}
+        	return s;
+        }
+        
         public boolean hasCancelPermission() {
             return task.hasAbortPermission();
         }
diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java
index d400e2fcc3..3ed2f60516 100644
--- a/core/src/main/java/hudson/model/RunParameterValue.java
+++ b/core/src/main/java/hudson/model/RunParameterValue.java
@@ -64,5 +64,10 @@ public class RunParameterValue extends ParameterValue {
     public void buildEnvVars(AbstractBuild<?,?> build, Map<String,String> env) {
         env.put(name.toUpperCase(), Hudson.getInstance().getRootUrl() + getRun().getUrl());
     }
+    
+    @Override
+    public String toString() {
+    	return "(RunParameterValue) " + getName() + "='" + getRunId() + "'";
+    }
 
 }
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index d101a27f19..ba29f93cc1 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -57,7 +57,7 @@ THE SOFTWARE.
       <j:otherwise>
         <j:forEach var="item" items="${items}">
           <tr>
-            <td class="pane" width="100%" tooltip="${item.why}" style="white-space: normal;">
+            <td class="pane" width="100%" tooltip="${item.why}${item.params}" style="white-space: normal;">
               <j:set var="stuck" value="${item.isStuck()}"/>
               <j:choose>
                 <j:when test="${h.hasPermission(item.task,item.task.READ)}">