diff --git a/CHANGELOG.md b/CHANGELOG.md
index a07d741..2b2827b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 The structure and content of this file follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.21.5] - 2024-04-11
+### Added
+- Makefiles
+
 ## [1.21.4] - 2024-02-29
 ### Fixed
 - Fixed regexp parsing to allow regexp escape sequences.
diff --git a/Makefile b/Makefile
index c51d192..2b889c6 100644
--- a/Makefile
+++ b/Makefile
@@ -26,4 +26,7 @@ cover: lint
 
 test: cover
 
-.PHONY: all lint cover test
+build:
+	make -C cmd
+
+.PHONY: all lint cover test build
diff --git a/cmd/Makefile b/cmd/Makefile
new file mode 100644
index 0000000..785425f
--- /dev/null
+++ b/cmd/Makefile
@@ -0,0 +1,5 @@
+
+build:
+	make -C oj
+
+.PHONY: all build
diff --git a/cmd/oj/Makefile b/cmd/oj/Makefile
new file mode 100644
index 0000000..57381d4
--- /dev/null
+++ b/cmd/oj/Makefile
@@ -0,0 +1,9 @@
+
+VERSION = $(shell git describe --tags --always --dirty)
+
+LDFLAG = "-s -w -X main.version=$(VERSION)"
+
+build:
+	go build -ldflags $(LDFLAG) .
+
+.PHONY: build
diff --git a/cmd/oj/main.go b/cmd/oj/main.go
index 553526e..fcd6a40 100644
--- a/cmd/oj/main.go
+++ b/cmd/oj/main.go
@@ -22,7 +22,7 @@ import (
 	"github.com/ohler55/ojg/sen"
 )
 
-const version = "1.19.4"
+var version = "unknown"
 
 var (
 	indent         = 2