diff --git a/Cargo.toml b/Cargo.toml
index b7ac05f7..59fbda71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-haskell"
 description = "Haskell grammar for tree-sitter"
-version = "1.0.0"
+version = "0.21.0"
 authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
 license = "MIT"
 keywords = ["incremental", "parsing", "tree-sitter", "haskell"]
diff --git a/Makefile b/Makefile
index 17175f2b..f2060f5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION := 0.0.1
+VERSION := 0.21.0
 
 LANGUAGE_NAME := tree-sitter-haskell
 
@@ -27,11 +27,13 @@ INCLUDEDIR ?= $(PREFIX)/include
 LIBDIR ?= $(PREFIX)/lib
 PCLIBDIR ?= $(LIBDIR)/pkgconfig
 
-# object files
-OBJS := $(patsubst %.c,%.o,$(wildcard $(SRC_DIR)/*.c))
+# source/object files
+PARSER := $(SRC_DIR)/parser.c
+EXTRAS := $(filter-out $(PARSER),$(wildcard $(SRC_DIR)/*.c))
+OBJS := $(patsubst %.c,%.o,$(PARSER) $(EXTRAS))
 
 # flags
-ARFLAGS := rcs
+ARFLAGS ?= rcs
 override CFLAGS += -I$(SRC_DIR) -std=c11 -fPIC
 
 # OS-specific bits
@@ -81,8 +83,8 @@ $(LANGUAGE_NAME).pc: bindings/c/$(LANGUAGE_NAME).pc.in
 		-e 's|=$(PREFIX)|=$${prefix}|' \
 		-e 's|@PREFIX@|$(PREFIX)|' $< > $@
 
-$(SRC_DIR)/parser.c: grammar.js
-	$(TS) generate --no-bindings
+$(PARSER): $(SRC_DIR)/grammar.json
+	$(TS) generate --no-bindings $^
 
 install: all
 	install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter '$(DESTDIR)$(PCLIBDIR)' '$(DESTDIR)$(LIBDIR)'
diff --git a/package-lock.json b/package-lock.json
index c1dd4616..df994613 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tree-sitter-haskell",
-  "version": "1.0.0",
+  "version": "0.21.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tree-sitter-haskell",
-      "version": "1.0.0",
+      "version": "0.21.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 6c8d3f17..731c4e43 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-haskell",
-  "version": "1.0.0",
+  "version": "0.21.0",
   "description": "Haskell grammar for tree-sitter",
   "repository": "github:tree-sitter/tree-sitter-haskell",
   "license": "MIT",
diff --git a/pyproject.toml b/pyproject.toml
index bb5eeb29..b6b08d37 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-haskell"
 description = "Haskell grammar for tree-sitter"
-version = "1.0.0"
+version = "0.21.0"
 keywords = ["incremental", "parsing", "tree-sitter", "haskell"]
 classifiers = [
   "Intended Audience :: Developers",