diff --git a/Tools/nvim/build b/Tools/nvim/build
new file mode 100755
index 0000000..2070f84
--- /dev/null
+++ b/Tools/nvim/build
@@ -0,0 +1,14 @@
+#!/usr/bin/env modbuild
+
+pbuild::install_linux_x86_64() {
+	cd "${PREFIX}"
+	tar --strip-components=1 -xvf "${PMODULES_DISTFILESDIR}/${P}-${V_PKG}-linux-x86_64.tar.gz"
+}
+
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/nvim/files/config.yaml b/Tools/nvim/files/config.yaml
new file mode 100644
index 0000000..59fc2a7
--- /dev/null
+++ b/Tools/nvim/files/config.yaml
@@ -0,0 +1,20 @@
+---
+format: 1
+nvim:
+  defaults:
+    group: Tools
+    relstage: stable
+  shasums:
+    nvim-0.11.1-linux-x86_64.tar.gz: 92ecb2dbdfbd0c6d79b522e07c879f7743c5d395d0a4f13b0d4f668f8565527a
+  versions:
+    0.11.1:
+      config:
+        target_cpus: [x86_64]
+        urls:
+          - url: https://github.com/neovim/neovim/releases/download/v${V_PKG}/${P}-linux-x86_64.tar.gz
+            name: ${P}-${V_PKG}-linux-x86_64.tar.gz
+            unpacker: none
+        build_functions:
+          configure: []
+          compile: []
+          install: [pbuild::install_linux_x86_64]
diff --git a/Tools/nvim/modulefile b/Tools/nvim/modulefile
new file mode 100644
index 0000000..85665e6
--- /dev/null
+++ b/Tools/nvim/modulefile
@@ -0,0 +1,11 @@
+#%Pmodule
+
+module-whatis		"hyperextensible Vim-based text editor"
+module-url		"https://neovim.io"
+module-license		"iApache License Version 2.0"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+hyperextensible Vim-based text editor
+"
+