diff --git a/languages.json b/languages.json
index 2797e972b..3473b97b0 100644
--- a/languages.json
+++ b/languages.json
@@ -1143,6 +1143,12 @@
       "multi_line_comments": [["(*", "*)"]],
       "extensions": ["sml"]
     },
+    "Smalltalk": {
+      "name": "Smalltalk",
+      "quotes": [["'", "'"]],
+      "multi_line_comments": [["\\\"", "\\\""]],
+      "extensions": ["cs.st", "pck.st"]
+    },
     "Solidity": {
       "name": "Solidity",
       "line_comment": ["//"],
diff --git a/tests/data/Smalltalk.cs.st b/tests/data/Smalltalk.cs.st
new file mode 100644
index 000000000..c4fc59579
--- /dev/null
+++ b/tests/data/Smalltalk.cs.st
@@ -0,0 +1,16 @@
+"16 lines 9 code 5 comment 2 blank"
+
+exampleWithNumber: x
+    | y |
+    "this is a comment"
+    true & false not & (nil isNil) ifFalse: [self halt].
+    y := self size + super size.
+    #($a #a 'a' 1 1.0)
+        do: [ :each |
+
+            "This is 
+            a multiline 
+            comment"
+            Transcript show: (each class name);
+                       show: ' '].
+    ^x < y