diff --git a/config/external/msgpack/moz.build b/config/external/msgpack/moz.build
new file mode 100644
index 000000000000..9e9599a8b228
--- /dev/null
+++ b/config/external/msgpack/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['/third_party/msgpack']
+
diff --git a/third_party/moz.build b/third_party/moz.build
index 837b425eafc9..183f5a2fb3e0 100644
--- a/third_party/moz.build
+++ b/third_party/moz.build
@@ -12,3 +12,6 @@ with Files('webkit/**'):
 
 with Files('prio/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
+
+with Files('msgpack/**'):
+    BUG_COMPONENT = ('Firefox Build System', 'General')
diff --git a/third_party/msgpack/moz.build b/third_party/msgpack/moz.build
new file mode 100644
index 000000000000..7e571d9469f5
--- /dev/null
+++ b/third_party/msgpack/moz.build
@@ -0,0 +1,28 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEFINES['MSGPACK_BUILD_LIBRARY'] = True
+
+LOCAL_INCLUDES += [
+    'include',
+]
+
+EXPORTS += [
+    'include/msgpack.h',
+]
+
+# We allow warnings for third-party code that can be updated from upstream.
+AllowCompilerWarnings()
+
+SOURCES += [
+    'objectc.c',
+    'unpack.c',
+    'version.c',
+    'vrefbuffer.c',
+    'zone.c',
+]
+
+FINAL_LIBRARY = 'xul'
\ No newline at end of file