diff --git a/README.md b/README.md
index 495e3fbeb1..7dee660aaf 100644
--- a/README.md
+++ b/README.md
@@ -439,6 +439,7 @@ If your language supports mixed multi-language servers, it is recommended to che
 | VHDL        | [vhdl-tool](https://www.vhdltool.com)                                                              |                                                                                                                                                                                                                                                                     |
 | Vue         | [volar](https://github.com/johnsoncodehk/volar)                                                    | `npm install -g typescript @vue/language-server`                                                                                                                                                                                                                    |
 | Wxml        | [wxml-language-server](https://github.com/chemzqm/wxml-languageserver)                             |                                                                                                                                                                                                                                                                     |
+| Yang        | [yang-ls](https://github.com/TypeFox/yang-lsp)                   |                                                                                                                                                                                          |
 | Yaml        | [yaml-language-server](https://github.com/redhat-developer/yaml-language-server)                   | `npm install -g yaml-language-server`                                                                                                                                                                                                                               |
 | Zig         | [zls](https://github.com/zigtools/zls)                                                             | Execute `zls config` to generate configuration for `zls`. see [Configuration Options](https://github.com/zigtools/zls#configuration-options)                                                                                                                          |
 | Solidity    | [solidity-language-server](https://github.com/NomicFoundation/hardhat-vscode)                      | `npm install -g @nomicfoundation/solidity-language-server`. see [Solidity Language Server](https://github.com/NomicFoundation/hardhat-vscode/blob/development/server/README.md)                                                                                     |
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 9e8a09fdcb..c02d814811 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -438,6 +438,7 @@ lsp-bridge 针对许多语言都提供 2 个以上的语言服务器支持， 
 | VHDL        | [vhdl-tool](https://www.vhdltool.com)                                                              |                                                                                                                                                                                                                               |
 | Vue         | [volar](https://github.com/johnsoncodehk/volar)                                                    | `npm install -g typescript @vue/language-server`                                                                                                                                                                              |
 | Wxml        | [wxml-language-server](https://github.com/chemzqm/wxml-languageserver)                             |                                                                                                                                                                                                                               |
+| Yang        | [yang-ls](https://github.com/TypeFox/yang-lsp)                   |                                                                                                                                                                                          |
 | Yaml        | [yaml-language-server](https://github.com/redhat-developer/yaml-language-server)                   | `npm install -g yaml-language-server`                                                                                                                                                                                         |
 | Zig         | [zls](https://github.com/zigtools/zls)                                                             | 运行 `zls config` 来生成 zls 的配置。 参考 [Configuration Options](https://github.com/zigtools/zls#configuration-options)                                                                                                     |
 | Solidity    | [solidity-language-server](https://github.com/NomicFoundation/hardhat-vscode)                      | `npm install -g @nomicfoundation/solidity-language-server`， 参考 [Solidity Language Server](https://github.com/NomicFoundation/hardhat-vscode/blob/development/server/README.md)                                             |                                               | `npm install -g emmet-ls`                                                                                                                                                                                                      |
diff --git a/langserver/yang-lsp.json b/langserver/yang-lsp.json
new file mode 100644
index 0000000000..cfad26ac80
--- /dev/null
+++ b/langserver/yang-lsp.json
@@ -0,0 +1,8 @@
+{
+  "name": "yang-lsp",
+  "languageId": "yang",
+  "command": [
+    "yang-lsp"
+  ],
+  "settings": {}
+}
diff --git a/lsp-bridge.el b/lsp-bridge.el
index 4f38bf973a..0f0e5cd656 100644
--- a/lsp-bridge.el
+++ b/lsp-bridge.el
@@ -577,6 +577,7 @@ Possible choices are basedpyright_ruff, pyright_ruff, pyright-background-analysi
     (solidity-mode .                                                             "solidity")
     (gleam-ts-mode .                                                             "gleam")
     (ada-mode .                                                                  "ada-language-server")
+    (yang-mode .                                                                 "yang-lsp")
     (mint-mode .                                                                 "mint-ls")
     (purescript-mode .                                                           "purescript-language-server")
     (perl-mode .                                                                 "perl-language-server")
@@ -681,6 +682,7 @@ Possible choices are basedpyright_ruff, pyright_ruff, pyright-background-analysi
     solidity-mode-hook
     gleam-ts-mode-hook
     ada-mode-hook
+    yang-mode-hook
     mint-mode-hook
     purescript-mode-hook
     perl-mode-hook
@@ -741,6 +743,7 @@ you can customize `lsp-bridge-get-workspace-folder' to return workspace folder p
     (raku-mode                  . raku-indent-offset)  ; Perl6/Raku
     (erlang-mode                . erlang-indent-level) ; Erlang
     (ada-mode                   . ada-indent)          ; Ada
+    (yang-mode                  . lsp-bridge-indent-two-level) ; Yang
     (mint-mode                  . lsp-bridge-indent-two-level) ; Mint
     (purescript-mode            . purescript-indent-offset) ; PureScript
     (futhark-mode               . futhark-indent-level) ; Futhark
diff --git a/todo.md b/todo.md
index 5f8485aa3c..a52f3c6147 100644
--- a/todo.md
+++ b/todo.md
@@ -116,6 +116,4 @@ Below LSP server haven't supported, PR are welcome. ;)
     - [github.com/microclimate-devops/xml-language-server](https://github.com/microclimate-devops/xml-language-server)
     - [github.com/angelozerr/lsp4xml](https://github.com/angelozerr/lsp4xml)
 
-54. **YANG**: [github.com/yang-tools/yang-lsp](https://github.com/yang-tools/yang-lsp)
-
 55. **Xtext** (Any Language): [github.com/eclipse/xtext-core](https://github.com/eclipse/xtext-core)