diff --git a/README.md b/README.md
index 1da0fab01..803505ac4 100644
--- a/README.md
+++ b/README.md
@@ -442,6 +442,7 @@ Json
 Jsx
 Julia
 Julius
+Juvix
 KakouneScript
 Kotlin
 Lean
diff --git a/languages.json b/languages.json
index aa99aaa02..c94b76478 100644
--- a/languages.json
+++ b/languages.json
@@ -846,6 +846,12 @@
       "name": "Jupyter Notebooks",
       "extensions": ["ipynb"]
     },
+    "Juvix": {
+      "nested": true,
+      "line_comment": ["--"],
+      "multi_line_comments": [["{-", "-}"]],
+      "extensions": ["juvix"]
+    },
     "K": {
       "name": "K",
       "nested": true,
diff --git a/tests/data/juvix.juvix b/tests/data/juvix.juvix
new file mode 100644
index 000000000..50b8a01e9
--- /dev/null
+++ b/tests/data/juvix.juvix
@@ -0,0 +1,22 @@
+{-- This is documentation --}
+module juvix;
+
+-- this is a line comment
+
+{-
+
+this is a block comment
+
+-}
+
+------------ many dashes in comment
+
+{-
+  {-
+  nested block comment
+  -}
+-}
+
+import Stdlib.Prelude open;
+
+main : Nat := 123;