diff --git a/data/inputs/Makefile b/data/inputs/Makefile
index 2ed41342..60a92e72 100644
--- a/data/inputs/Makefile
+++ b/data/inputs/Makefile
@@ -1,10 +1,10 @@
-all_ezfio: $(shell for i in *.out.ezfio ; do echo $$i ; done)
-all_md5: $(shell for i in *.out.ezfio.md5 ; do echo $$i ; done)
+all_ezfio: $(shell for i in *.out.ezfio.md5 ; do echo $$(basename $$i .md5) ; done)
+all_md5: $(shell for i in *.out.ezfio ; do echo $$i.md5 ; done)
 
 FORCE:
 
-%.ezfio: FORCE
-	archive_ezfio.sh $@
-
 %.ezfio.md5: FORCE
-	unarchive_ezfio.sh $@
+	archive_ezfio.sh $(basename $@ .md5)
+
+%.ezfio: FORCE
+	unarchive_ezfio.sh $@.md5