diff --git a/Makefile.am b/Makefile.am
index bf8a3c41..8d50c746 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -300,7 +300,7 @@ snapraid.1 : snapraid.d
 	advd2 man < $(srcdir)/$< > $@
 
 snapraid.txt : snapraid.d
-	advd2 txt < $(srcdir)/$< | todos > $@
+	advd2 txt < $(srcdir)/$< | utod > $@
 
 snapraid.html : snapraid.d
 	advd2 html < $(srcdir)/$< > $@
@@ -319,13 +319,13 @@ distwindows-x86: $(DISTWIN)
 	rm -f $(PACKAGE)-$(VERSION)-windows-x86.zip
 	mkdir tmp
 	cp $(DISTWIN) tmp
-	cp snapraid.conf.example.windows tmp/snapraid.conf.example
-	cp INSTALL.windows tmp/install.txt
-	cp README tmp/readme.txt
-	cp AUTHORS tmp/authors.txt
-	cp HISTORY tmp/history.txt
-	cp COPYING tmp/copying.txt
-	cp TODO tmp/todo.txt
+	utod < snapraid.conf.example.windows > tmp/snapraid.conf.example
+	utod < INSTALL.windows > tmp/install.txt
+	utod < README > tmp/readme.txt
+	utod < AUTHORS > tmp/authors.txt
+	utod < HISTORY > tmp/history.txt
+	utod < COPYING > tmp/copying.txt
+	utod < TODO > tmp/todo.txt
 	cd tmp && zip -r ../$(PACKAGE)-$(VERSION)-windows-x86.zip *
 	rm -r tmp
 
@@ -333,13 +333,13 @@ distwindows-x64: $(DISTWIN)
 	rm -f $(PACKAGE)-$(VERSION)-windows-x64.zip
 	mkdir tmp
 	cp $(DISTWIN) tmp
-	cp snapraid.conf.example.windows tmp/snapraid.conf.example
-	cp INSTALL.windows tmp/install.txt
-	cp README tmp/readme.txt
-	cp AUTHORS tmp/authors.txt
-	cp HISTORY tmp/history.txt
-	cp COPYING tmp/copying.txt
-	cp TODO tmp/todo.txt
+	utod < snapraid.conf.example.windows > tmp/snapraid.conf.example
+	utod < INSTALL.windows > tmp/install.txt
+	utod < README > tmp/readme.txt
+	utod < AUTHORS > tmp/authors.txt
+	utod < HISTORY > tmp/history.txt
+	utod < COPYING > tmp/copying.txt
+	utod < TODO > tmp/todo.txt
 	cd tmp && zip -r ../$(PACKAGE)-$(VERSION)-windows-x64.zip *
 	rm -r tmp