diff --git a/Network/AMQP/Internal.hs b/Network/AMQP/Internal.hs
--- a/Network/AMQP/Internal.hs
+++ b/Network/AMQP/Internal.hs
@@ -1,6 +1,9 @@
 {-# LANGUAGE BangPatterns, CPP, OverloadedStrings, ScopedTypeVariables #-}
 module Network.AMQP.Internal where
 
+import Paths_amqp(version)
+import Data.Version(showVersion)
+
 import Control.Concurrent
 import Control.Monad
 import Data.Binary
@@ -314,10 +317,12 @@
         in abortIfNothing maybeSasl handle
             ("None of the provided SASL mechanisms "++show clientSaslList++" is supported by the server "++show serverSaslList++".")
 
-    start_ok sasl = (Frame 0 (MethodPayload (Connection_start_ok (FieldTable M.empty)
-        (ShortString $ saslName sasl)
-        (LongString $ saslInitialResponse sasl)
-        (ShortString "en_US")) ))
+    start_ok sasl = (Frame 0 (MethodPayload (Connection_start_ok clientProperties
+                                             (ShortString $ saslName sasl)
+                                             (LongString $ saslInitialResponse sasl)
+                                             (ShortString "en_US")) ))
+                    where clientProperties = FieldTable $ M.fromList [ ("platform", FVString "Haskell")
+                                                                     , ("version" , FVString . T.pack $ showVersion version)]
 
     handleSecureUntilTune handle sasl = do
         tuneOrSecure <- readFrame handle
diff --git a/amqp.cabal b/amqp.cabal
--- a/amqp.cabal
+++ b/amqp.cabal
@@ -1,5 +1,5 @@
 Name:                amqp
-Version:             0.12.2
+Version:             0.12.3
 Synopsis:            Client library for AMQP servers (currently only RabbitMQ)
 Description:         Client library for AMQP servers (currently only RabbitMQ)
                      .
@@ -40,7 +40,7 @@
      build-depends: network < 2.6
 
   Exposed-modules:    Network.AMQP, Network.AMQP.Types, Network.AMQP.Lifted
-  Other-modules:      Network.AMQP.ChannelAllocator, Network.AMQP.Generated, Network.AMQP.Helpers, Network.AMQP.Protocol, Network.AMQP.Internal
+  Other-modules:      Network.AMQP.ChannelAllocator, Network.AMQP.Generated, Network.AMQP.Helpers, Network.AMQP.Protocol, Network.AMQP.Internal, Paths_amqp
   GHC-Options:        -Wall
 
 Executable amqp-builder
@@ -57,7 +57,7 @@
   type:
       exitcode-stdio-1.0
   ghc-options:
-      -Wall -Werror
+      -Wall
   hs-source-dirs:
       ., test
   main-is: