diff --git a/akka-contrib/docs/reliable-proxy.rst b/akka-contrib/docs/reliable-proxy.rst
index 4cf8c1a383..da6ed1be12 100644
--- a/akka-contrib/docs/reliable-proxy.rst
+++ b/akka-contrib/docs/reliable-proxy.rst
@@ -3,6 +3,10 @@
 Reliable Proxy Pattern
 ======================
 
+.. warning::
+  **Deprecation warning** - ``ReliableProxy`` has been deprecated and is scheduled for removal 
+  in the next major version. Use :ref:`at-least-once-delivery-scala` instead. 
+
 Looking at :ref:`message-delivery-reliability` one might come to the conclusion that
 Akka actors are made for blue-sky scenarios: sending messages is the only way
 for actors to communicate, and then that is not even guaranteed to work. Is the
diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
index 96d175c68d..dc3b44713d 100644
--- a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
@@ -10,6 +10,7 @@ import scala.concurrent.duration._
 import scala.util.Try
 import java.util.concurrent.TimeUnit
 
+@deprecated("Use AtLeastOnceDelivery instead", "2.5.0")
 object ReliableProxy {
   /**
    * Scala API Props.  Arguments are detailed in the [[akka.contrib.pattern.ReliableProxy]]
@@ -224,6 +225,7 @@ import ReliableProxy._
  * @param maxConnectAttempts  is an optional maximum number of attempts to connect to the
  *   target actor. Use `None` for no limit. If `reconnectAfter` is `None` this value is ignored.
  */
+@deprecated("Use AtLeastOnceDelivery instead", "2.5.0")
 class ReliableProxy(targetPath: ActorPath, retryAfter: FiniteDuration,
                     reconnectAfter: Option[FiniteDuration], maxConnectAttempts: Option[Int])
   extends Actor with LoggingFSM[State, Vector[Message]] with ReliableProxyDebugLogging {
diff --git a/akka-docs/rst/project/migration-guide-2.4.x-2.5.x.rst b/akka-docs/rst/project/migration-guide-2.4.x-2.5.x.rst
index 8f576faf5e..3459279855 100644
--- a/akka-docs/rst/project/migration-guide-2.4.x-2.5.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.4.x-2.5.x.rst
@@ -577,6 +577,13 @@ PeekMailbox
 
 .. _migration-guide-TimerBasedThrottler:
 
+ReliableProxy
+-------------
+
+``ReliableProxy`` is deprecated. Use :ref:`at-least-once-delivery-scala` instead. ``ReliableProxy``
+was only intended as an example and doesn't have full production quality. If there is demand
+for a lightweight (non-durable) at-least once delivery mechanism we are open for a design discussion.
+
 TimerBasedThrottler
 -------------------