diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h
index cac12d2a12343a381a9741ccd2fe7934a9991c45..e445505f6ef29aad829a9724ba6f21342795a44d 100644
--- a/include/Swiften/SwiftenCompat.h
+++ b/include/Swiften/SwiftenCompat.h
@@ -26,6 +26,7 @@
  * Using these it is possible to declare shared pointers and signals like this:
  *
  * SWIFTEN_SIGNAL_NAMESPACE::signal signal;
+ * SWIFTEN_SIGNAL_CONNECTION_NAMESPACE::connection &connection;
  * SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Type> ptr;
  *
  * These are guaranteed to be the same implementation as Swift uses internally,
@@ -38,11 +39,16 @@
 #if (SWIFTEN_VERSION >= 0x040000)
 #define SWIFTEN_UNIQUE_PTR std::unique_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE std
+#include <boost/signals2.hpp>
 #define SWIFTEN_SIGNAL_NAMESPACE boost::signals2
+#define SWIFTEN_SIGNAL_CONNECTION_NAMESPACE boost::signals2
 #define SWIFT_HOSTADDRESS(x) *(Swift::HostAddress::fromString(x))
 #else
 #define SWIFTEN_UNIQUE_PTR std::auto_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE boost
-#define SWIFTEN_SIGNAL_NAMESPACE boost::signals
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING
+#include <boost/signals.hpp>
+#define SWIFTEN_SIGNAL_NAMESPACE boost
+#define SWIFTEN_SIGNAL_CONNECTION_NAMESPACE boost::signals
 #define SWIFT_HOSTADDRESS(x) Swift::HostAddress(x)
 #endif