diff --git a/Language.ml b/Language.ml
index 21eb857..fda4fa5 100644
--- a/Language.ml
+++ b/Language.ml
@@ -16,6 +16,7 @@ type t =
 | Elixir
 | Go
 | Hack
+| Haskell
 | Html
 | Java
 | Js
@@ -268,6 +269,19 @@ let list = [
   shebangs = [{|hhvm|}];
   tags = [];
 };
+{
+  id = Haskell;
+  id_string = "haskell";
+  name = "Haskell";
+  keys = [{|haskell|}; {|hs|}];
+  exts = [{|.hs|}; {|.lhs|}];
+  maturity = Develop;
+  example_ext = Some {|.hs|};
+  excluded_exts = [];
+  reverse_exts = None;
+  shebangs = [{|runhaskell|}; {|runghc|}];
+  tags = [];
+};
 {
   id = Html;
   id_string = "html";
diff --git a/Language.mli b/Language.mli
index 424f6ca..4504f9d 100644
--- a/Language.mli
+++ b/Language.mli
@@ -16,6 +16,7 @@ type t =
 | Elixir
 | Go
 | Hack
+| Haskell
 | Html
 | Java
 | Js
diff --git a/generate.py b/generate.py
index c7f1ace..2af4911 100755
--- a/generate.py
+++ b/generate.py
@@ -333,6 +333,16 @@ def to_json(self):
         maturity=Maturity.DEVELOP,
         shebangs=["hhvm"]
     ),
+    Language(
+        comment="",
+        id_="haskell",
+        name="Haskell",
+        keys=["haskell", "hs"],
+        exts=[".hs", ".lhs"],
+        example_ext=".hs",
+        maturity=Maturity.DEVELOP,
+        shebangs=["runhaskell", "runghc"]
+    ),
     Language(
         comment="",
         id_="html",
diff --git a/lang.json b/lang.json
index e94e9e7..234c443 100644
--- a/lang.json
+++ b/lang.json
@@ -277,6 +277,28 @@
     "is_target_language": true,
     "tags": []
   },
+  {
+    "id": "haskell",
+    "name": "Haskell",
+    "keys": [
+      "haskell",
+      "hs"
+    ],
+    "maturity": "develop",
+    "exts": [
+      ".hs",
+      ".lhs"
+    ],
+    "example_ext": ".hs",
+    "excluded_exts": [],
+    "reverse_exts": null,
+    "shebangs": [
+      "runhaskell",
+      "runghc"
+    ],
+    "is_target_language": true,
+    "tags": []
+  },
   {
     "id": "html",
     "name": "HTML",