diff --git a/build.bat b/build.bat
index 35933ca..66e62bc 100644
--- a/build.bat
+++ b/build.bat
@@ -16,6 +16,9 @@ for /r "libdparse/src" %%F in (*.d) do call set libdparse_modules=%%libdparse_mo
 set allocator_modules=
 for /r "libdparse/experimental_allocator/src" %%F in (*.d) do call set allocator_modules=%%allocator_modules%% "%%F"
 
+set msgspack_modules=
+for /r "msgpack-d/src" %%F in (*.d) do call set msgspack_modules=%%msgspack_modules%% "%%F"
+
 set client_name=bin\dcd-client
 set server_name=bin\dcd-server
 
@@ -24,7 +27,7 @@ dmd^
  src\common\messages.d^
  src\common\dcd_version.d^
  src\common\socket.d^
- msgpack-d\src\msgpack.d^
+ %msgspack_modules%^
  -Imsgpack-d\src^
  -release -inline -O -wi^
  -of%client_name%
@@ -36,7 +39,7 @@ dmd^
  %common_modules%^
  %containers_modules%^
  %allocator_modules%^
- msgpack-d/src/msgpack.d^
+ %msgspack_modules%^
  -Icontainers/src^
  -Imsgpack-d/src^
  -Ilibdparse/src^