diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..91a6265
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "makros"]
+	path = makros
+	url = https://tildegit.org/opfez/makros
diff --git a/Makefile b/Makefile
index 186c372..f0875a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
 CFLAGS = -Wall -Wextra -Werror -std=c99 -pedantic
 FORMAT = ./format
+MAKROS = ./makros/makros
 
 default: gen
 
 $(FORMAT): format.c
 	$(CC) $(CFLAGS) $< -o $@
 
-gen: $(FORMAT) site-src/*
+$(MAKROS): makros/makros.c
+	cd makros && make
+
+gen: $(FORMAT) $(MAKROS) site-src/*
 	./gen.sh
 
 .PHONY: clean
diff --git a/TODO.org b/TODO.org
index afcdba3..ff52263 100644
--- a/TODO.org
+++ b/TODO.org
@@ -3,6 +3,8 @@ Writan:
 
 Pages:
  - Add a category theory page (more general, math).
+ - A page about APL (and trains), different combinators could be cool.
 
 Orphan pages:
  - Emacs
+ - Netbpm
diff --git a/gen.sh b/gen.sh
index aff3271..7201d63 100755
--- a/gen.sh
+++ b/gen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # makros binary
-MAKROS=./makros
+MAKROS=./makros/makros
 
 if ! find $MAKROS 2>/dev/null >/dev/null; then
     echo "couldn't find the makros binary"
diff --git a/makros b/makros
new file mode 160000
index 0000000..2992b0e
--- /dev/null
+++ b/makros
@@ -0,0 +1 @@
+Subproject commit 2992b0e0f987e39dbf578d5c180ce8d62dc6cb50