diff --git a/Makefile.am b/Makefile.am
index 12341b1f8..550b96f2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,7 @@ DOCS_PAGES = \
 
 ED25519_SOURCE = \
 	ed25519/readme.md \
-	ed25519/test.cpp \
+	ed25519/test.c \
 	ed25519/src/fe.h \
 	ed25519/src/fixedint.h \
 	ed25519/src/ge.h \
diff --git a/build_dist.sh b/build_dist.sh
index f0a102370..be654f39a 100755
--- a/build_dist.sh
+++ b/build_dist.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+make distclean
 
 #clear out any extended attributes that Finder may add
 sudo xattr -r -d com.apple.FinderInfo *