diff --git a/mix.exs b/mix.exs
index 18d1323..2ce8dea 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,13 +43,10 @@ defmodule Relay.Mixfile do
   end
 
   defp deps do
-    [{:earmark, "~> 0.1", only: :dev},
-     {:ex_doc, "~> 0.11", only: :dev},
-     {:mix_test_watch, "~> 0.2", only: [:dev, :test]},
-     {:emqttc, github: "emqtt/emqttc", branch: "master"},
-     {:poison, "~> 1.5.0"},
-     {:uuid, "~> 1.0.1"},
-     {:logger_file_backend, github: "onkel-dirtus/logger_file_backend", tag: "v0.0.6"},
+    [{:emqttc, github: "operable/emqttc", ref: "dc36f593822f8e01771a7edc780441fdfb2f7b15"},
+     {:poison, "~> 1.5.2"},
+     {:uuid, "~> 1.1.3"},
+     {:logger_file_backend, github: "onkel-dirtus/logger_file_backend", ref: "457ce74fc242261328f71a77d75252bf0c74c170"},
 
      # Though we do not explicitly use Spanner in Relay, we provide it
      # as a runtime dependency for command bundles.
@@ -61,13 +58,17 @@ defmodule Relay.Mixfile do
      #
      # Ditto for Piper (a dependency of spanner and runtime dependency
      # of bundles).
-     {:spanner, git: "git@github.com:operable/spanner", ref: "314d40dbf326ecc29d7f9291491fb69a8fe70b34"},
+     {:spanner, git: "git@github.com:operable/spanner", ref: "33af977194f2377048ae41a4e9d180ebc86e4d70"},
+
      # Same as Cog uses, and only for test, as a way to get around
      # Mix's annoying habit of starting up the application before
      # running ExUnit; Relay will not start unless there is a message
      # bus to connect to.
-     {:emqttd, github: "operable/emqttd", branch: "tweaks-for-upstream", only: :test}
-    ]
+     {:emqttd, github: "operable/emqttd", branch: "tweaks-for-upstream", only: :test},
+
+     {:earmark, "~> 0.2.1", only: :dev},
+     {:ex_doc, "~> 0.11.4", only: :dev},
+     {:mix_test_watch, "~> 0.2.5", only: :dev}]
   end
 
   defp docs do
diff --git a/mix.lock b/mix.lock
index 9adcb26..9507915 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,22 +1,22 @@
-%{"adz": {:git, "git@github.com:operable/adz", "ccb8d704273df616fa57e45c66275e59feeace46", [tag: "0.1-rc1"]},
-  "carrier": {:git, "git@github.com:operable/carrier", "09b83330cf957f247eef760723ac19718b5263a5", [ref: "385f2d6f724dfd5fea0421e010b9883486ca3cf6"]},
-  "earmark": {:hex, :earmark, "0.2.0"},
-  "emqttc": {:git, "https://github.com/emqtt/emqttc.git", "9c989657a0e9beaf29ebef64d019c46381cb3599", [branch: "master"]},
+%{"adz": {:git, "git@github.com:operable/adz", "140db3cc4dbecee1a2b68e8d0b18d7c64f27996a", [ref: "140db3cc4dbecee1a2b68e8d0b18d7c64f27996a"]},
+  "carrier": {:git, "git@github.com:operable/carrier", "4cb2e0981a8c548551702cba6a1453a9f5d15c08", [ref: "4cb2e0981a8c548551702cba6a1453a9f5d15c08"]},
+  "earmark": {:hex, :earmark, "0.2.1"},
+  "emqttc": {:git, "https://github.com/operable/emqttc.git", "dc36f593822f8e01771a7edc780441fdfb2f7b15", [ref: "dc36f593822f8e01771a7edc780441fdfb2f7b15"]},
   "emqttd": {:git, "https://github.com/operable/emqttd.git", "e99446c927299ced7d93437f94c18e73a9cc0e75", [branch: "tweaks-for-upstream"]},
   "enacl": {:git, "https://github.com/jlouis/enacl.git", "03f93c4f7d0cb56b5a86b445cb004a3a8de2278b", [tag: "0.15.0"]},
   "esockd": {:git, "git://github.com/emqtt/esockd.git", "7f1f2052422b4e2960260689c82576d15288e0b7", [branch: "master"]},
-  "ex_doc": {:hex, :ex_doc, "0.11.3"},
+  "ex_doc": {:hex, :ex_doc, "0.11.4"},
   "fs": {:hex, :fs, "0.9.2"},
   "gen_logger": {:git, "git://github.com/emqtt/gen_logger.git", "eced518f1dea167bebd576bb8b1cccb764a45739", [branch: "master"]},
   "getopt": {:git, "https://github.com/jcomellas/getopt.git", "626698975e63866156159661d100785d65eab6f9", [branch: "master"]},
   "goldrush": {:git, "git://github.com/DeadZen/goldrush.git", "64864ba7fcf40988361340e48680b49a2c2938cf", [tag: "0.1.7"]},
   "gproc": {:git, "git://github.com/uwiger/gproc.git", "85d8dddf2b04690cee051994b40bfa45925f9e36", [branch: "master"]},
   "lager": {:git, "git://github.com/basho/lager.git", "310ed140ab86b95dd9f1f1ed3bf2ca93f841349d", [branch: "master"]},
-  "logger_file_backend": {:git, "https://github.com/onkel-dirtus/logger_file_backend.git", "1a93ad84e12fa79f979fea2a70d1d1b0b1fe2899", [tag: "v0.0.6"]},
+  "logger_file_backend": {:git, "https://github.com/onkel-dirtus/logger_file_backend.git", "457ce74fc242261328f71a77d75252bf0c74c170", [ref: "457ce74fc242261328f71a77d75252bf0c74c170"]},
   "mix_test_watch": {:hex, :mix_test_watch, "0.2.5"},
   "mochiweb": {:git, "git://github.com/emqtt/mochiweb.git", "f1ce26fe373b2a9b52b0b1a5d2306ebb225af7bd", [branch: "master"]},
-  "piper": {:git, "git@github.com:operable/piper", "1b0526c67541b59ff4ede84153a29f9b74e62d98", [ref: "1b0526c67541b59ff4ede84153a29f9b74e62d98"]},
-  "poison": {:hex, :poison, "1.5.0"},
+  "piper": {:git, "git@github.com:operable/piper", "acfb2150a25004a5ab2a80e7a5bfd418f35ea532", [ref: "acfb2150a25004a5ab2a80e7a5bfd418f35ea532"]},
+  "poison": {:hex, :poison, "1.5.2"},
   "porcelain": {:hex, :porcelain, "2.0.1"},
-  "spanner": {:git, "git@github.com:operable/spanner", "314d40dbf326ecc29d7f9291491fb69a8fe70b34", [ref: "314d40dbf326ecc29d7f9291491fb69a8fe70b34"]},
-  "uuid": {:hex, :uuid, "1.0.1"}}
+  "spanner": {:git, "git@github.com:operable/spanner", "33af977194f2377048ae41a4e9d180ebc86e4d70", [ref: "33af977194f2377048ae41a4e9d180ebc86e4d70"]},
+  "uuid": {:hex, :uuid, "1.1.3"}}