diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java
index e7bf9a21b5..613cea2227 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java
@@ -57,7 +57,10 @@ import org.springframework.web.HttpRequestHandler;
  * </p>
  * 
  * @author Mark Fisher
+ * 
+ * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead.
  */
+@Deprecated
 public class HttpInvokerInboundGateway extends RemotingInboundGatewaySupport implements HttpRequestHandler {
 
 	private volatile HttpInvokerServiceExporter exporter;
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java
index a937df1e21..41325a9973 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java
@@ -24,7 +24,10 @@ import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;
  * A MessageHandler adapter for HttpInvoker-based remoting.
  * 
  * @author Mark Fisher
+ * 
+ * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead.
  */
+@Deprecated
 public class HttpInvokerOutboundGateway extends AbstractRemotingOutboundGateway {
 
 	public HttpInvokerOutboundGateway(String url) {
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java
index 735e7a1139..4f6c1a565a 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java
@@ -24,7 +24,10 @@ import org.springframework.integration.adapter.config.AbstractRemotingGatewayPar
  * Parser for the &lt;httpinvoker-gateway/&gt; element. 
  * 
  * @author Mark Fisher
+ * 
+ * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead.
  */
+@Deprecated
 public class HttpInvokerInboundGatewayParser extends AbstractRemotingGatewayParser {
 
 	@Override
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java
index ac8cbfbebb..e8e2e4ac79 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java
@@ -22,7 +22,10 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa
  * Namespace handler for Spring Integration's <em>httpinvoker</em> namespace.
  * 
  * @author Mark Fisher
+ * 
+ * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead.
  */
+@Deprecated
 public class HttpInvokerNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java
index 7f60e235e0..437a3eab9d 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java
@@ -24,7 +24,10 @@ import org.springframework.integration.adapter.config.AbstractRemotingOutboundGa
  * Parser for the &lt;outbound-gateway/&gt; element of the 'httpinvoker' namespace.
  * 
  * @author Mark Fisher
+ * 
+ * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead.
  */
+@Deprecated
 public class HttpInvokerOutboundGatewayParser extends AbstractRemotingOutboundGatewayParser {
 
 	@Override
diff --git a/org.springframework.integration.httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd b/org.springframework.integration.httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd
index 8bc4882dc7..a96ea37a3e 100644
--- a/org.springframework.integration.httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd
+++ b/org.springframework.integration.httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd
@@ -16,6 +16,8 @@
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
 	Defines the configuration elements for Spring Integration's HttpInvoker adapters.
+	NOTE: The http-invoker support is deprecated as of 2.0.x
+	      We recommend using the REST-based HTTP adapters instead.
 		]]></xsd:documentation>
 	</xsd:annotation>