diff --git a/.travis.yml b/.travis.yml
index 8e8f2759cc..71074650c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -420,8 +420,12 @@ before_script:
   - "> config.status"
   - "> .rbconfig.time"
   - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
-  - date; make touch-unicode-files
-  - date; make --debug -s $JOBS $UPDATE_UNICODE up
+  - |-
+    for i in 1 2 3; do
+      date; make touch-unicode-files || break
+      ls -l tool/generic_erb.rb template/unicode_norm_gen.tmpl enc/unicode/data/*/ucd/.unicode-tables.time
+      date; make -s $JOBS $UPDATE_UNICODE up && break
+    done
   - date; make -s $JOBS srcs
   - rm -f config.status Makefile rbconfig.rb .rbconfig.time
   - |-
diff --git a/common.mk b/common.mk
index f795df874a..0d6da60672 100644
--- a/common.mk
+++ b/common.mk
@@ -1399,7 +1399,7 @@ $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
 	$(Q) $(MAKE) $(@D)
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
 		-c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \
-                -o $(srcdir)/lib/unicode_normalize/tables.rb \
+		-o $(srcdir)/lib/unicode_normalize/tables.rb \
 		-I $(srcdir) \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(UNICODE_DATA_DIR) lib/unicode_normalize