diff --git a/crates/tabby-common/assets/languages.toml b/crates/tabby-common/assets/languages.toml
index 7fd025322e26..83d07285c5d5 100644
--- a/crates/tabby-common/assets/languages.toml
+++ b/crates/tabby-common/assets/languages.toml
@@ -223,6 +223,12 @@ top_level_keywords = [
     "type",
 ]
 
+[[config]]
+languages = ["r"]
+exts = ["R", "r"]
+line_comment = "#"
+top_level_keywords = ["function", "library", "install.packages"]
+
 [[config]]
 languages = ["css"]
 exts = ["css"]
@@ -281,4 +287,4 @@ exts = ["tex"]
 
 [[config]]
 languages = ["vb"]
-exts = ["vb"]
\ No newline at end of file
+exts = ["vb"]
diff --git a/website/docs/programming-languages.md b/website/docs/programming-languages.md
index c27ff909b1bb..ee075949945d 100644
--- a/website/docs/programming-languages.md
+++ b/website/docs/programming-languages.md
@@ -33,6 +33,7 @@ For an actual example of an issue or pull request adding the above support, plea
 * [PHP](https://www.php.net/)
 * [C#](https://learn.microsoft.com/en-us/dotnet/csharp/)
 * [Solidity](https://soliditylang.org/): Since v0.10.0
+* [R](https://www.r-project.org/): Since v0.12.0
 
 ## Languages Missing Certain Support