diff --git a/httpkit/project.clj b/httpkit/project.clj
index d6da81d..3ea3aa0 100644
--- a/httpkit/project.clj
+++ b/httpkit/project.clj
@@ -4,4 +4,4 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :plugins [[lein-modules "0.3.9"]]
-  :dependencies [[http-kit "2.1.16"]])
+  :dependencies [[http-kit "2.1.19"]])
diff --git a/httpkit/src/com/palletops/bakery/httpkit.clj b/httpkit/src/com/palletops/bakery/httpkit.clj
index 34ee823..874b82f 100644
--- a/httpkit/src/com/palletops/bakery/httpkit.clj
+++ b/httpkit/src/com/palletops/bakery/httpkit.clj
@@ -22,7 +22,10 @@
   (start [component]
     (if server
       component
-      (assoc component :server (start handler config))))
+      (let [server (start handler config)]
+        (-> component
+            (assoc-in [:config :port] (-> server meta :local-port))
+            (assoc :server server)))))
   Stoppable
   (stop [component]
     (if server