diff --git a/builds/mingw32/Makefile.mingw32 b/builds/mingw32/Makefile.mingw32
index 8de66f85..e54135e0 100644
--- a/builds/mingw32/Makefile.mingw32
+++ b/builds/mingw32/Makefile.mingw32
@@ -3,7 +3,7 @@ CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=1024 -DZMQ_USE_SELECT -I.
 LIBS=-lws2_32
 
 OBJS = ctx.o reaper.o dist.o err.o \
-	clock.o random.o \
+	clock.o metadata.o random.o \
 	object.o own.o \
 	io_object.o io_thread.o \
 	lb.o fq.o \
diff --git a/builds/msvc/vs2008/libzmq/libzmq.vcproj b/builds/msvc/vs2008/libzmq/libzmq.vcproj
index 232389bc..ad98d0e5 100644
--- a/builds/msvc/vs2008/libzmq/libzmq.vcproj
+++ b/builds/msvc/vs2008/libzmq/libzmq.vcproj
@@ -120,6 +120,7 @@
       <File RelativePath="..\..\..\..\src\lb.cpp" />
       <File RelativePath="..\..\..\..\src\mailbox.cpp" />
       <File RelativePath="..\..\..\..\src\mechanism.cpp" />
+      <File RelativePath="..\..\..\..\src\metadata.cpp" />
       <File RelativePath="..\..\..\..\src\msg.cpp" />
       <File RelativePath="..\..\..\..\src\mtrie.cpp" />
       <File RelativePath="..\..\..\..\src\null_mechanism.cpp" />
@@ -199,6 +200,7 @@
       <File RelativePath="..\..\..\..\src\likely.hpp" />
       <File RelativePath="..\..\..\..\src\mailbox.hpp" />
       <File RelativePath="..\..\..\..\src\mechanism.hpp" />
+      <File RelativePath="..\..\..\..\src\metadata.hpp" />
       <File RelativePath="..\..\..\..\src\msg.hpp" />
       <File RelativePath="..\..\..\..\src\mtrie.hpp" />
       <File RelativePath="..\..\..\..\src\mutex.hpp" />
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
index 41c238e7..dc70ea43 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
@@ -275,6 +275,7 @@
     <ClCompile Include="..\..\..\..\src\lb.cpp" />
     <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
     <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
+    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
     <ClCompile Include="..\..\..\..\src\msg.cpp" />
     <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
     <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
index 40033e9d..27eb4b1b 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@@ -58,6 +58,9 @@
     <ClCompile Include="..\..\..\..\src\mechanism.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\metadata.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\src\msg.cpp">
       <Filter>src</Filter>
     </ClCompile>
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
index 9bb7d667..d0053971 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
@@ -275,6 +275,7 @@
     <ClCompile Include="..\..\..\..\src\lb.cpp" />
     <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
     <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
+    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
     <ClCompile Include="..\..\..\..\src\msg.cpp" />
     <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
     <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
index 40033e9d..27eb4b1b 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@@ -58,6 +58,9 @@
     <ClCompile Include="..\..\..\..\src\mechanism.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\metadata.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\src\msg.cpp">
       <Filter>src</Filter>
     </ClCompile>
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
index 65e2efbd..4bedaa1f 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@@ -281,6 +281,7 @@
     <ClCompile Include="..\..\..\..\src\lb.cpp" />
     <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
     <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
+    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
     <ClCompile Include="..\..\..\..\src\msg.cpp" />
     <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
     <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
index 40033e9d..27eb4b1b 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@@ -58,6 +58,9 @@
     <ClCompile Include="..\..\..\..\src\mechanism.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\metadata.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\src\msg.cpp">
       <Filter>src</Filter>
     </ClCompile>