diff --git a/modules/xz-embedded/COPYING b/modules/xz-embedded/COPYING
new file mode 100644
index 000000000000..fc4fbf798d09
--- /dev/null
+++ b/modules/xz-embedded/COPYING
@@ -0,0 +1,10 @@
+
+Licensing of XZ Embedded
+========================
+
+    All the files in this package have been written by Lasse Collin
+    and/or Igor Pavlov. All these files have been put into the
+    public domain. You can do whatever you want with these files.
+
+    As usual, this software is provided "as is", without any warranty.
+
diff --git a/modules/xz-embedded/README.mozilla b/modules/xz-embedded/README.mozilla
deleted file mode 100644
index d0532e1e9164..000000000000
--- a/modules/xz-embedded/README.mozilla
+++ /dev/null
@@ -1,14 +0,0 @@
-This is the XZ Embedded decompression library from
-http://tukaani.org/xz/embedded.html.
-
-Upstream code can be viewed at
-  http://git.tukaani.org/xz-embedded.git
-
-and cloned by
-  git clone http://git.tukaani.org/xz-embedded.git
-
-The in-tree copy is updated by running
-  sh update.sh
-from within the modules/xz-embedded directory.
-
-Current version: [e75f4eb79165213a02d567940d344f5c2ff1be03].
diff --git a/modules/xz-embedded/moz.yaml b/modules/xz-embedded/moz.yaml
new file mode 100644
index 000000000000..4d6674c17753
--- /dev/null
+++ b/modules/xz-embedded/moz.yaml
@@ -0,0 +1,74 @@
+schema: 1
+
+bugzilla:
+  product: GeckoView
+  component: General
+
+origin:
+  name: xz embedded
+  description: https://tukaani.org/xz/embedded.html
+
+  url: https://tukaani.org/xz/embedded.html
+
+  release: b'e75f4eb79165213a02d567940d344f5c2ff1be03' (b'2015-11-03 21:27:39 +0200').
+  revision: b'e75f4eb79165213a02d567940d344f5c2ff1be03'
+
+  license: Public Domain
+  license-file: COPYING
+
+vendoring:
+  url: http://git.tukaani.org/xz-embedded.git
+  source-hosting: git
+  tracking: commit
+
+  exclude:
+    - ".*"
+    - "*"
+    - "**"
+
+  keep:
+    - COPYING
+
+  include:
+    - userspace/xz_config.h
+    - linux/include/linux/xz.h
+    - linux/lib/xz/xz_private.h
+    - linux/lib/xz/xz_lzma2.h
+    - linux/lib/xz/xz_stream.h
+    - linux/lib/xz/xz_crc32.c
+    - linux/lib/xz/xz_crc64.c
+    - linux/lib/xz/xz_dec_bcj.c
+    - linux/lib/xz/xz_dec_stream.c
+    - linux/lib/xz/xz_dec_lzma2.c
+
+  update-actions:
+    - action: move-file
+      from: '{vendor_dir}/userspace/xz_config.h'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/include/linux/xz.h'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_private.h'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_lzma2.h'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_stream.h'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_crc32.c'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_crc64.c'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_dec_bcj.c'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_dec_stream.c'
+      to: '{vendor_dir}/src/'
+    - action: move-file
+      from: '{vendor_dir}/linux/lib/xz/xz_dec_lzma2.c'
+      to: '{vendor_dir}/src/'
diff --git a/modules/xz-embedded/update.sh b/modules/xz-embedded/update.sh
deleted file mode 100755
index ecc1e3610e74..000000000000
--- a/modules/xz-embedded/update.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# Script to update the Mozilla in-tree copy of XZ Embedded.
-
-MY_TEMP_DIR=$(mktemp -d -t xz-embedded_update.XXXXXX) || exit 1
-
-git clone http://git.tukaani.org/xz-embedded.git ${MY_TEMP_DIR}/xz-embedded
-
-COMMIT=$(git -C ${MY_TEMP_DIR}/xz-embedded rev-parse HEAD)
-cd $(dirname $0)
-perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[${COMMIT}]/" README.mozilla;
-
-rm -rf src
-mkdir src
-mv ${MY_TEMP_DIR}/xz-embedded/userspace/xz_config.h src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/include/linux/xz.h src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_private.h src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_lzma2.h src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_stream.h src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_crc32.c src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_crc64.c src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_dec_bcj.c src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_dec_stream.c src/
-mv ${MY_TEMP_DIR}/xz-embedded/linux/lib/xz/xz_dec_lzma2.c src/
-rm -rf ${MY_TEMP_DIR}
-hg addremove src
-
-echo "###"
-echo "### Updated xz-embedded/src to $COMMIT."
-echo "### Remember to verify and commit the changes to source control!"
-echo "###"
diff --git a/python/mozbuild/mozbuild/vendor/moz_yaml.py b/python/mozbuild/mozbuild/vendor/moz_yaml.py
index 68780ea29356..c094d22a2b78 100644
--- a/python/mozbuild/mozbuild/vendor/moz_yaml.py
+++ b/python/mozbuild/mozbuild/vendor/moz_yaml.py
@@ -44,6 +44,7 @@ VALID_LICENSES = [
     "MIT",
     "MPL-1.1",
     "MPL-2.0",
+    "Public Domain",
     "Unlicense",
     "WTFPL",
     "Zlib",