diff --git a/lua/mason-registry/index.lua b/lua/mason-registry/index.lua
index 7b119e4c57..2a813b01d5 100644
--- a/lua/mason-registry/index.lua
+++ b/lua/mason-registry/index.lua
@@ -198,6 +198,7 @@ return {
   xo = "mason-registry.xo",
   ["yaml-language-server"] = "mason-registry.yaml-language-server",
   yamllint = "mason-registry.yamllint",
+  yapf = "mason-registry.yapf",
   zk = "mason-registry.zk",
   zls = "mason-registry.zls"
 }
\ No newline at end of file
diff --git a/lua/mason-registry/yapf/init.lua b/lua/mason-registry/yapf/init.lua
new file mode 100644
index 0000000000..c8cb521291
--- /dev/null
+++ b/lua/mason-registry/yapf/init.lua
@@ -0,0 +1,11 @@
+local Pkg = require "mason-core.package"
+local pip3 = require "mason-core.managers.pip3"
+
+return Pkg.new {
+    name = "yapf",
+    desc = [[YAPF, Yet Another Python Formatter]],
+    homepage = "https://pypi.org/project/yapf/",
+    languages = { Pkg.Lang.Python },
+    categories = { Pkg.Cat.Formatter },
+    install = pip3.packages { "yapf", bin = { "yapf" } },
+}
diff --git a/lua/mason/mappings/language.lua b/lua/mason/mappings/language.lua
index a49100f48c..d5e5cc61cb 100644
--- a/lua/mason/mappings/language.lua
+++ b/lua/mason/mappings/language.lua
@@ -83,7 +83,7 @@ return {
   protobuf = { "buf" },
   puppet = { "puppet-editor-services" },
   purescript = { "purescript-language-server" },
-  python = { "autopep8", "black", "blue", "debugpy", "flake8", "isort", "jedi-language-server", "mypy", "pylint", "pyright", "python-lsp-server", "sourcery", "vulture" },
+  python = { "autopep8", "black", "blue", "debugpy", "flake8", "isort", "jedi-language-server", "mypy", "pylint", "pyright", "python-lsp-server", "sourcery", "vulture", "yapf" },
   r = { "r-languageserver" },
   reason = { "reason-language-server" },
   rescript = { "rescript-lsp" },