diff --git a/ChangeLog b/ChangeLog
index 0acf22565..f6e00c6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-03  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 43333: Etc/Makefile.in: Generate FAQ.html in the builddir,
+	rather than in the srcdir, and add it to the default target of
+	the Etc/ subdirectory.
+
 2018-09-03  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 43365: Src/Zle/zle_keymap.c, Src/Zle/zle_main.c,
diff --git a/Etc/Makefile.in b/Etc/Makefile.in
index b6743a7ec..9adba95db 100644
--- a/Etc/Makefile.in
+++ b/Etc/Makefile.in
@@ -40,13 +40,13 @@ INSTALL         = @INSTALL@
 
 # ========== DEPENDENCIES FOR BUILDING ==========
 
-all: FAQ
+all: FAQ FAQ.html
 
-FAQ: FAQ.yo
-	cd $(sdir) && $(YODL2TXT) FAQ.yo && mv -f FAQ.txt FAQ
+FAQ: $(sdir)/FAQ.yo
+	$(YODL2TXT) -o FAQ.txt $< && mv FAQ.txt $@
 
-FAQ.html: FAQ.yo
-	$(YODL2HTML) $(sdir)/FAQ.yo
+FAQ.html: $(sdir)/FAQ.yo
+	$(YODL2HTML) -o $@ $<
 
 # ========== DEPENDENCIES FOR CLEANUP ==========