diff --git a/Changelog.md b/Changelog.md
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 # Changelog for net-mqtt
 
+## 0.6.2.2
+
+Support query parameters in ws and wss URLs.
+
 ## 0.6.2.1
 
 Added function to get original connection ACK response packet.
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 ### Publish
 
 ```haskell
-main :: IO
+main :: IO ()
 main = do
   let (Just uri) = parseURI "mqtt://test.mosquitto.org"
   mc <- connectURI mqttConfig{} uri
@@ -17,7 +17,7 @@
 ### Subscribe
 
 ```haskell
-main :: IO
+main :: IO ()
 main = do
   let (Just uri) = parseURI "mqtt://test.mosquitto.org"
   mc <- connectURI mqttConfig{_msgCB=SimpleCallback msgReceived} uri
diff --git a/net-mqtt.cabal b/net-mqtt.cabal
--- a/net-mqtt.cabal
+++ b/net-mqtt.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: c2a4b0d05fac2cbfd290e0b0b8b6c2d564370d3b63f467144979056c4f492ed1
+-- hash: 0ef5244416ed2dc4d066d967825e5d4fb9c65cc896a00c5718cc2b9dbadbb29e
 
 name:           net-mqtt
-version:        0.6.2.1
+version:        0.6.2.2
 synopsis:       An MQTT Protocol Implementation.
 description:    Please see the README on GitHub at <https://github.com/dustin/mqtt-hs#readme>
 category:       Network
diff --git a/src/Network/MQTT/Client.hs b/src/Network/MQTT/Client.hs
--- a/src/Network/MQTT/Client.hs
+++ b/src/Network/MQTT/Client.hs
@@ -207,11 +207,15 @@
         adaptor ad = (appSource ad, appSink ad)
 
 runWS :: URI -> Bool -> MQTTConfig -> IO MQTTClient
-runWS uri secure cfg@MQTTConfig{..} = runMQTTConduit (adapt $ cf secure _hostname _port (uriPath uri) WS.defaultConnectionOptions hdrs) cfg
+runWS URI{uriPath, uriQuery} secure cfg@MQTTConfig{..} =
+  runMQTTConduit (adapt $ cf secure _hostname _port endpoint WS.defaultConnectionOptions hdrs) cfg
+
   where
     hdrs = [("Sec-WebSocket-Protocol", "mqtt")]
     adapt mk f = mk (f . adaptor)
     adaptor s = (wsSource s, wsSink s)
+
+    endpoint = uriPath <> uriQuery
 
     cf :: Bool -> String -> Int -> String -> WS.ConnectionOptions -> WS.Headers -> WS.ClientApp () -> IO ()
     cf False = WS.runClientWith