diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
index 0e46ffe4e1e..78cee038273 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
@@ -173,7 +173,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	 * <ol>
 	 * 	<li>Sort 'Accept' header media types by quality value via
 	 * 	{@link MediaType#sortByQualityValue(List)} and iterate the list.
-	 * 	<li>Get the lowest index of matching media types from each "produces" 
+	 * 	<li>Get the first index of matching media types in each "produces"
 	 * 	condition first matching with {@link MediaType#equals(Object)} and 
 	 * 	then with {@link MediaType#includes(MediaType)}.
 	 *  <li>If a lower index is found, the condition at that index wins.
@@ -220,7 +220,9 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 
 	private int indexOfEqualMediaType(MediaType mediaType) {
 		for (int i = 0; i < getExpressionsToCompare().size(); i++) {
-			if (mediaType.equals(getExpressionsToCompare().get(i).getMediaType())) {
+			MediaType currentMediaType = getExpressionsToCompare().get(i).getMediaType();
+			if (mediaType.getType().equalsIgnoreCase(currentMediaType.getType()) &&
+					mediaType.getSubtype().equalsIgnoreCase(currentMediaType.getSubtype())) {
 				return i;
 			}
 		}
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
index e2e0bb0b5c8..4bbff56fd69 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
@@ -218,6 +218,20 @@ public class ProducesRequestConditionTests {
 		assertTrue(condition2.compareTo(condition1, request) > 0);
 	}
 
+	// SPR-9021
+
+	@Test
+	public void compareToMediaTypeAllWithParameter() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Accept", "*/*;q=0.9");
+
+		ProducesRequestCondition condition1 = new ProducesRequestCondition();
+		ProducesRequestCondition condition2 = new ProducesRequestCondition("application/json");
+
+		assertTrue(condition1.compareTo(condition2, request) < 0);
+		assertTrue(condition2.compareTo(condition1, request) > 0);
+	}
+
 	@Test
 	public void compareToEqualMatch() {
 		MockHttpServletRequest request = new MockHttpServletRequest();