diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp
index 06eb9501e..453d7ad0b 100644
--- a/lib/base/networkstream.hpp
+++ b/lib/base/networkstream.hpp
@@ -11,7 +11,7 @@ namespace icinga
 {
 
 /**
- * A network stream.
+ * A network stream. DEPRECATED - Use Boost ASIO instead.
  *
  * @ingroup base
  */
diff --git a/lib/base/tcpsocket.hpp b/lib/base/tcpsocket.hpp
index 0f8334f01..668e7882b 100644
--- a/lib/base/tcpsocket.hpp
+++ b/lib/base/tcpsocket.hpp
@@ -12,7 +12,7 @@ namespace icinga
 {
 
 /**
- * A TCP socket.
+ * A TCP socket. DEPRECATED - Use Boost ASIO instead.
  *
  * @ingroup base
  */
@@ -27,6 +27,11 @@ public:
 	void Connect(const String& node, const String& service);
 };
 
+/**
+ * TCP Connect based on Boost ASIO.
+ *
+ * @ingroup base
+ */
 template<class Socket>
 void Connect(Socket& socket, const String& node, const String& service)
 {
diff --git a/lib/base/unixsocket.hpp b/lib/base/unixsocket.hpp
index 5d6df8fa8..80a9f255e 100644
--- a/lib/base/unixsocket.hpp
+++ b/lib/base/unixsocket.hpp
@@ -9,6 +9,11 @@
 namespace icinga
 {
 
+/**
+ * A TCP socket. DEPRECATED - Use Boost ASIO instead.
+ *
+ * @ingroup base
+ */
 class UnixSocket final : public Socket
 {
 public: