diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelector.java
similarity index 87%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageSelector.java
rename to spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelector.java
index a6278dc223..5cb4e53ab4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSelector.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelector.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.message.selector;
+
+import org.springframework.integration.message.Message;
 
 /**
  * Strategy interface for message selection.
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java
new file mode 100644
index 0000000000..55178fbc45
--- /dev/null
+++ b/spring-integration-core/src/main/java/org/springframework/integration/message/selector/PayloadTypeSelector.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.message.selector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.integration.message.Message;
+import org.springframework.util.Assert;
+
+/**
+ * A {@link MessageSelector} implementation that checks the type of the
+ * {@link Message} payload. The payload type must be assignable to at least one
+ * of the selector's accepted types.
+ * 
+ * @author Mark Fisher
+ */
+public class PayloadTypeSelector implements MessageSelector {
+
+	private List<Class<?>> acceptedTypes = new ArrayList<Class<?>>();
+
+
+	/**
+	 * Create a selector for the provided types. At least one is required.
+	 */
+	public PayloadTypeSelector(Class<?>... types) {
+		Assert.notEmpty(types, "at least one type is required");
+		for (Class<?> type : types) {
+			this.acceptedTypes.add(type);
+		}
+	}
+
+
+	public boolean accept(Message<?> message) {
+		Assert.notNull(message, "'message' must not be null");
+		Object payload = message.getPayload();
+		Assert.notNull(payload, "'payload' must not be null");
+		for (Class<?> type : this.acceptedTypes) {
+			if (type.isAssignableFrom(payload.getClass())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java
new file mode 100644
index 0000000000..3dc625d596
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.message.selector;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.springframework.integration.MessagingException;
+import org.springframework.integration.message.ErrorMessage;
+import org.springframework.integration.message.GenericMessage;
+import org.springframework.integration.message.StringMessage;
+
+/**
+ * @author Mark Fisher
+ */
+public class PayloadTypeSelectorTests {
+
+	@Test
+	public void testAcceptedTypeIsSelected() {
+		PayloadTypeSelector selector = new PayloadTypeSelector(String.class);
+		assertTrue(selector.accept(new StringMessage("test")));
+	}
+
+	@Test
+	public void testNonAcceptedTypeIsNotSelected() {
+		PayloadTypeSelector selector = new PayloadTypeSelector(Integer.class);
+		assertFalse(selector.accept(new StringMessage("test")));
+	}
+
+	@Test
+	public void testMultipleAcceptedTypes() {
+		PayloadTypeSelector selector = new PayloadTypeSelector(String.class, Integer.class);
+		assertTrue(selector.accept(new StringMessage("test1")));
+		assertTrue(selector.accept(new GenericMessage<Integer>(2)));
+		assertFalse(selector.accept(new ErrorMessage(new RuntimeException())));
+	}
+
+	@Test
+	public void testSubclassOfAcceptedTypeIsSelected() {
+		PayloadTypeSelector selector = new PayloadTypeSelector(RuntimeException.class);
+		assertTrue(selector.accept(new ErrorMessage(new MessagingException("test"))));
+	}
+
+	@Test
+	public void testSuperclassOfAcceptedTypeIsNotSelected() {
+		PayloadTypeSelector selector = new PayloadTypeSelector(RuntimeException.class);
+		assertFalse(selector.accept(new ErrorMessage(new Exception("test"))));
+	}
+
+}