diff --git a/.gitmodules b/.gitmodules
index e8f85fc37..9544b776f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,6 @@
 [submodule "sources/app/deft"]
 	path = sources/app/deft
 	url = https://github.com/dylan-lang/deft
+[submodule "sources/app/lsp-dylan"]
+	path = sources/app/lsp-dylan
+	url = https://github.com/dylan-lang/lsp-dylan
diff --git a/Makefile.in b/Makefile.in
index d83e7b3d1..11fb1b16d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,7 +191,7 @@ BOOTSTRAP_3_ROOT = $(abs_builddir)/Bootstrap.3
 BOOTSTRAP_3_LIBRARIES = \
 	dylan-compiler dylan-environment parser-compiler dswank
 BOOTSTRAP_3_STATICS = \
-	deft-app
+	deft-app dylan-lsp-server
 
 BOOTSTRAP_3_COMPILER = \
         $(BOOTSTRAP_2_ROOT)/bin/dylan-compiler \
diff --git a/documentation/release-notes/source/2024.2.rst b/documentation/release-notes/source/2024.2.rst
index 78bde46b4..fa87319f4 100644
--- a/documentation/release-notes/source/2024.2.rst
+++ b/documentation/release-notes/source/2024.2.rst
@@ -20,6 +20,18 @@ this release.
 Compiler
 ========
 
+Tools
+=====
+
+* A new binary, ``dylan-lsp-server``, is bundled in this release. This is a
+  Language Server Protocol (LSP) implementation for use with VS Code and
+  emacs. It currently supports jump to definition/declaration, compiler
+  warnings, and hover text.
+
+  See the `lsp-server documentation
+  <https://opendylan.org/package/lsp-dylan/index.html>`_ for configuration
+  details.
+
 Library Updates
 ===============
 
diff --git a/sources/app/lsp-dylan b/sources/app/lsp-dylan
new file mode 160000
index 000000000..0b30b0026
--- /dev/null
+++ b/sources/app/lsp-dylan
@@ -0,0 +1 @@
+Subproject commit 0b30b002617f0ab923a218ca4dfef025685ce215
diff --git a/sources/registry/generic/dylan-lsp-server b/sources/registry/generic/dylan-lsp-server
new file mode 100644
index 000000000..e7f504e23
--- /dev/null
+++ b/sources/registry/generic/dylan-lsp-server
@@ -0,0 +1 @@
+abstract://dylan/app/lsp-dylan/sources/server.lid
diff --git a/sources/registry/generic/lsp-dylan b/sources/registry/generic/lsp-dylan
new file mode 100644
index 000000000..0ad733622
--- /dev/null
+++ b/sources/registry/generic/lsp-dylan
@@ -0,0 +1 @@
+abstract://dylan/app/lsp-dylan/sources/lsp-dylan.lid
diff --git a/sources/registry/generic/lsp-dylan-test-suite b/sources/registry/generic/lsp-dylan-test-suite
new file mode 100644
index 000000000..3171d1be3
--- /dev/null
+++ b/sources/registry/generic/lsp-dylan-test-suite
@@ -0,0 +1 @@
+abstract://dylan/app/lsp-dylan/sources/test-suite.lid