diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js
index 9ddb11f22a..b3f9b4519a 100644
--- a/packages/htmljs/package.js
+++ b/packages/htmljs/package.js
@@ -4,6 +4,7 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
+  api.use('deps');
   api.export('HTML');
 
   api.add_files(['utils.js', 'html.js', 'tohtml.js']);
diff --git a/tools/bundler.js b/tools/bundler.js
index 37d8f242aa..5369402235 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1782,14 +1782,17 @@ exports.bundle = function (options) {
       });
 
       // Server
-      var browserClient = targets["client.browser"] ||
-                          makeBlankClientTarget(app);
-      if (browserClient) {
-        var server = options.cachedServerTarget ||
-                     makeServerTarget(app, browserClient);
-        server.clientTarget = browserClient;
-        targets.server = server;
+      var browserClient = targets["client.browser"];
+
+      if (! browserClient) {
+        browserClient = makeBlankClientTarget(app);
+        targets["client.browser"] = browserClient;
       }
+
+      var server = options.cachedServerTarget ||
+                   makeServerTarget(app, browserClient);
+      server.clientTarget = browserClient;
+      targets.server = server;
     }
 
     // Pick up any additional targets in /programs