diff --git a/M2/Macaulay2/packages/CMakeLists.txt b/M2/Macaulay2/packages/CMakeLists.txt
index 6fb18560e73..b1039a1f7c8 100644
--- a/M2/Macaulay2/packages/CMakeLists.txt
+++ b/M2/Macaulay2/packages/CMakeLists.txt
@@ -141,7 +141,6 @@ foreach(package IN LISTS PACKAGES)
     file(COPY ${package}  DESTINATION ${M2_DIST_PREFIX}/${M2_INSTALL_DATADIR})
   endif()
 
-
   ## Configuring the command strings
   _M2_STRING_CONFIGURE(M2_INSTALL_TEMPLATE M2_INSTALL_STRING TRUE)
   _M2_STRING_CONFIGURE(M2_CHECK_TEMPLATE   M2_CHECK_STRING)
@@ -256,3 +255,7 @@ endforeach()
 
 file(COPY LanguageServer/M2-language-server
      DESTINATION ${M2_DIST_PREFIX}/${M2_INSTALL_BINDIR})
+
+install(PROGRAMS LanguageServer/M2-language-server
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
+        COMPONENT ALL)
diff --git a/M2/Macaulay2/packages/LanguageServer/M2-language-server b/M2/Macaulay2/packages/LanguageServer/M2-language-server
index 6bdc151fa32..247b3f043dc 100755
--- a/M2/Macaulay2/packages/LanguageServer/M2-language-server
+++ b/M2/Macaulay2/packages/LanguageServer/M2-language-server
@@ -1,6 +1,13 @@
 #!/bin/sh
 
-M2 --silent --stop                    \
+dir=$(dirname "$0")
+if [ -x "$dir/M2" ]; then
+    M2="$dir/M2"
+else
+    M2=M2
+fi
+
+"$M2" --silent --stop                 \
    -e 'clearEcho stdio'               \
    -e 'needsPackage "LanguageServer"' \
    -e 'server = new LSPServer'        \