diff --git a/Makefile b/Makefile
index 46afc990d..5fc2b3d66 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,15 @@ download_stats:
 	curl https://api.github.com/repos/jgm/pandoc/releases | \
 		jq -r '.[] | .assets | .[] | "\(.download_count)\t\(.name)"'
 
+pandoc-templates:
+	rm ../pandoc-templates/default.* ; \
+	cp data/templates/default.* ../pandoc-templates/ ; \
+	pushd ../pandoc-templates/ && \
+	git add default.* && \
+	git commit -m "Updated templates for pandoc $(version)" && \
+	popd
+
 clean:
 	stack clean
 
-.PHONY: deps quick full haddock install clean test bench changes_github macospkg dist prof download_stats reformat lint weigh doc/lua-filters.md packages
+.PHONY: deps quick full haddock install clean test bench changes_github macospkg dist prof download_stats reformat lint weigh doc/lua-filters.md packages pandoc-templates
diff --git a/RELEASE-CHECKLIST b/RELEASE-CHECKLIST
index f3e42a55e..bc0a85f41 100644
--- a/RELEASE-CHECKLIST
+++ b/RELEASE-CHECKLIST
@@ -7,11 +7,10 @@ _ make man/pandoc.1 and commit if needed
 
 _ Tag release in git
 
-_ Push templates:
-  git subtree push --prefix=data/templates git@github.com:jgm/pandoc-templates.git master
+_ make pandoc-templates
   cd ../pandoc-templates
-  git pull
   git tag REL
+  git push
   git push --tags
 
 _ Generate Windows package (make winpkg)