diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 549aa9739204698eaaeaae697c033c2cda82c17d..376ad681ffe92492e11e9d63d1603db9c57c205d 100644
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -98,7 +98,7 @@ template <class SPolicy>
 prefix_ std::string senf::ClientSocketHandle<SPolicy>::read(unsigned limit)
 {
     std::string rv;
-    this->read(rv,limit);
+    this->read(rv, limit);
     return rv;
 }
 
@@ -122,8 +122,8 @@ senf::ClientSocketHandle<SPolicy>::readfrom(unsigned limit)
 {
     std::string rv;
     boost::value_initialized<typename SPolicy::AddressingPolicy::Address> addr;
-    this->readfrom(rv,addr.data(),limit);
-    return std::make_pair(rv,addr.data());
+    this->readfrom(rv, addr.data(), limit);
+    return std::make_pair(rv, addr.data());
 }
 
 template <class SPolicy>
diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti
index cba6c6fbf3e853cea9c48e9b9c894f9d6910538e..fef092d4814ef991f1cd987b1145e3c742683e8e 100644
--- a/Socket/ClientSocketHandle.cti
+++ b/Socket/ClientSocketHandle.cti
@@ -297,6 +297,7 @@ prefix_ char const * senf::ClientSocketHandle<SPolicy>::writeto(AddressParam add
 template <class SPolicy>
 prefix_ typename SPolicy::AddressingPolicy::Address
 senf::ClientSocketHandle<SPolicy>::peer()
+    const
 {
     typename SPolicy::AddressingPolicy::Address addr;
     this->peer(addr);
@@ -306,8 +307,9 @@ senf::ClientSocketHandle<SPolicy>::peer()
 template <class SPolicy>
 prefix_ void senf::ClientSocketHandle<SPolicy>::
 peer(typename SPolicy::AddressingPolicy::Address & addr)
+    const
 {
-    SPolicy::AddressingPolicy::peer(*this,addr);
+    SPolicy::AddressingPolicy::peer(*this, addr);
 }
 
 // senf::ClientSocketHandle<SPolicy>::local
@@ -315,6 +317,7 @@ peer(typename SPolicy::AddressingPolicy::Address & addr)
 template <class SPolicy>
 prefix_ typename SPolicy::AddressingPolicy::Address
 senf::ClientSocketHandle<SPolicy>::local()
+    const
 {
     typename SPolicy::AddressingPolicy::Address addr;
     this->local(addr);
@@ -324,6 +327,7 @@ senf::ClientSocketHandle<SPolicy>::local()
 template <class SPolicy>
 prefix_ void senf::ClientSocketHandle<SPolicy>::
 local(typename SPolicy::AddressingPolicy::Address & addr)
+    const
 {
     SPolicy::AddressingPolicy::local(*this,addr);
 }
@@ -332,8 +336,9 @@ local(typename SPolicy::AddressingPolicy::Address & addr)
 
 template <class SPolicy>
 prefix_ void senf::ClientSocketHandle<SPolicy>::connect(AddressParam addr)
+    const
 {
-    SPolicy::AddressingPolicy::connect(*this,addr);
+    SPolicy::AddressingPolicy::connect(*this, addr);
 }
 
 // senf::ClientSocketHandle<SPolicy>::bind
@@ -341,8 +346,9 @@ prefix_ void senf::ClientSocketHandle<SPolicy>::connect(AddressParam addr)
 template <class SPolicy>
 prefix_ void senf::ClientSocketHandle<SPolicy>::
 bind(typename boost::call_traits<typename SPolicy::AddressingPolicy::Address>::param_type addr)
+    const
 {
-    SPolicy::AddressingPolicy::bind(*this,addr);
+    SPolicy::AddressingPolicy::bind(*this, addr);
 }
 
 ////////////////////////////////////////
@@ -372,7 +378,7 @@ template <class SPolicy>
 prefix_ void senf::ClientSocketHandle<SPolicy>::state(SocketStateMap & map, unsigned lod)
 {
     map["handle"] = prettyName(typeid(*this));
-    this->body().state(map,lod);
+    this->body().state(map, lod);
 }
 
 template <class SPolicy>
diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh
index ee23d522fb0ac772af5afeb394fa88bb4dcf439a..cb9868ff9560743667427df5fa8dccdc3d0f0023 100644
--- a/Socket/ClientSocketHandle.hh
+++ b/Socket/ClientSocketHandle.hh
@@ -374,18 +374,18 @@ namespace senf {
 
             \throws senf::SystemException
          */
-        void         connect      (AddressParam addr);
+        void         connect      (AddressParam addr) const;
 
         /** \brief Set local address
 
             For addressable protocols (AddressingPolicy is not NoAddressingPolicy), bind() will set
             the local address of the socket.
 
-            \param[in] addr Local socket address to asign
+            \param[in] addr Local socket address to assign
 
             \throws senf::SystemException
          */
-        void         bind         (AddressParam addr);
+        void         bind         (AddressParam addr) const;
 
         /** \brief Query remote address
 
@@ -398,8 +398,8 @@ namespace senf {
 
             \throws senf::SystemException
          */
-        Address      peer         ();
-        void         peer         (Address & addr);
+        Address      peer         () const;
+        void         peer         (Address & addr) const;
                                         ///< Query remote address
                                         /**< \see \ref peer() */
 
@@ -413,8 +413,8 @@ namespace senf {
 
             \throws senf::SystemException
          */
-        Address      local        ();
-        void         local        (Address & addr);
+        Address      local        () const;
+        void         local        (Address & addr) const;
                                         ///< Query local address
                                         /**< \see \ref local() */