diff --git a/build_daemon/CHANGELOG.md b/build_daemon/CHANGELOG.md
index 717e17423..c16c4aa04 100644
--- a/build_daemon/CHANGELOG.md
+++ b/build_daemon/CHANGELOG.md
@@ -6,6 +6,10 @@
   `Stream<WatchEvent>`. This allows file change notifications to be sent as
   batches of simultaneous changes, preventing over-triggering of builds.
 
+## 0.6.1
+
+- Use `HttpMultiServer` to better support IPv6 and IPv4 workflows.
+
 ## 0.6.0
 
 - Add retry logic to the state file helpers `runningVersion` and
diff --git a/build_daemon/lib/src/server.dart b/build_daemon/lib/src/server.dart
index 71e3940d4..7a17bd9b5 100644
--- a/build_daemon/lib/src/server.dart
+++ b/build_daemon/lib/src/server.dart
@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:built_value/serializer.dart';
+import 'package:http_multi_server/http_multi_server.dart';
 import 'package:pool/pool.dart';
 import 'package:shelf/shelf_io.dart';
 import 'package:shelf_web_socket/shelf_web_socket.dart';
@@ -79,7 +80,9 @@ class Server {
         _removeChannel(channel);
       });
     });
-    _server = await serve(handler, 'localhost', 0);
+
+    _server = await HttpMultiServer.loopback(0);
+    serveRequests(_server, handler);
     return _server.port;
   }
 
diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml
index 9906e1daf..9adcb7a6b 100644
--- a/build_daemon/pubspec.yaml
+++ b/build_daemon/pubspec.yaml
@@ -10,6 +10,7 @@ environment:
 dependencies:
   built_collection: ^4.1.0
   built_value: ^6.3.0
+  http_multi_server: ^2.0.0
   logging: ^0.11.0
   pedantic: ^1.0.0
   package_resolver: ^1.0.6