diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86505452..6b1d3624 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Changed
 - Move the development tools to Phive
-  ([#850](https://github.com/MyIntervals/emogrifier/pull/850))
+  ([#850](https://github.com/MyIntervals/emogrifier/pull/850),
+  [#851](https://github.com/MyIntervals/emogrifier/pull/851))
 - Switch the parallel linting to a maintained fork
   ([#842](https://github.com/MyIntervals/emogrifier/pull/842))
 - Move continuous integration from Travis CI to GitHub actions
diff --git a/composer.json b/composer.json
index 5277b74d..e7d9d08e 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,6 @@
     },
     "require-dev": {
         "grogy/php-parallel-lint": "^1.1.0",
-        "phpmd/phpmd": "^2.7.0",
         "phpunit/phpunit": "^6.5.14",
         "psalm/plugin-phpunit": "^0.5.8",
         "slevomat/coding-standard": "^4.0.0",
@@ -74,7 +73,7 @@
         "ci:php:lint": "parallel-lint config src tests",
         "ci:php:sniff": "phpcs config src tests",
         "ci:php:fixer": "./tools/php-cs-fixer --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff-format=udiff config/ src/ tests/",
-        "ci:php:md": "phpmd src text config/phpmd.xml",
+        "ci:php:md": "./tools/phpmd src text config/phpmd.xml",
         "ci:php:psalm": "psalm --show-info=false",
         "ci:tests:unit": "phpunit tests/",
         "ci:tests:sof": "phpunit tests/ --stop-on-failure",
diff --git a/phive.xml b/phive.xml
index 6b048c8e..c4da154e 100644
--- a/phive.xml
+++ b/phive.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-    <phar name="php-cs-fixer" version="^2.16" installed="2.16.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.16" installed="2.16.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="phpmd" version="^2.7" installed="2.7.0" location="./tools/phpmd" copy="true"/>
 </phive>
diff --git a/tools/phpmd b/tools/phpmd
new file mode 100755
index 00000000..cbbaac93
Binary files /dev/null and b/tools/phpmd differ