diff --git a/dawg/Spanish/Makefile b/dawg/Spanish/Makefile
index d937189f8..141d0e74c 100644
--- a/dawg/Spanish/Makefile
+++ b/dawg/Spanish/Makefile
@@ -43,11 +43,14 @@ include ../Makefile.langcommon
 #$(LANG)Main.dict.gz: SpanishMain.dict.gz
 #	ln -s $< $@
 
-$(XWLANG)Main.dict.gz: $(XWDICTPATH)/$(XWLANG)/XavSpanish.dict.gz Makefile
+SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/XavSpanish.dict.gz
+
+$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile
 	zcat $< \
+	| tr -d '\r' \
 	| tr '\207\216\222\227\234\237\226' 'aeiouu\321' \
-	| tr [a-zñ] [A-ZÑ] \
-	| grep '^[[A-JL-VX-ZÑ]*$$' \
+	| tr [a-zñ] [A-ZÑ] \
+	| grep '^[[A-JL-VX-ZÑ]*$$' \
 	| sed 's/CH/1/g' \
 	| sed 's/LL/2/g' \
 	| sed 's/RR/3/g' \
diff --git a/dawg/Spanish/info.txt b/dawg/Spanish/info.txt
index 129af7d83..f11f81318 100644
--- a/dawg/Spanish/info.txt
+++ b/dawg/Spanish/info.txt
@@ -1,3 +1,4 @@
+# -*- mode: conf; -*-
 # Copyright 2002-2006 by Eric House (xwords@eehouse.org).  All rights
 # reserved.
 #