diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt
index 13a2979d6..8a28dc6aa 100644
--- a/doc/es/CMakeLists.txt
+++ b/doc/es/CMakeLists.txt
@@ -19,6 +19,19 @@
 
 if(ENABLE_DOC)
 
+  # FAQ
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.es.html
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.es.adoc
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.es.adoc
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Building weechat_faq.es.html"
+  )
+  add_custom_target(doc-faq-es ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.es.html)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.es.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})
+
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html
diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am
index a2982cfe2..1f524ddcd 100644
--- a/doc/es/Makefile.am
+++ b/doc/es/Makefile.am
@@ -21,6 +21,7 @@ docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
              docinfo.html \
+             weechat_faq.es.adoc \
              weechat_quickstart.es.adoc
 
 if MAN
@@ -29,12 +30,17 @@ if MAN
   man_uninstall =
 endif
 if DOC
-  doc_targets = weechat_quickstart.es.html
+  doc_targets = weechat_faq.es.html \
+		weechat_quickstart.es.html
   doc_install = install-doc
   doc_uninstall = uninstall-doc
 endif
 all-local: $(man_targets) $(doc_targets)
 
+# FAQ
+weechat_faq.es.html: weechat_faq.es.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_faq.es.html $(abs_top_srcdir)/doc/es/weechat_faq.es.adoc
+
 # quickstart
 weechat_quickstart.es.html: weechat_quickstart.es.adoc $(abs_top_srcdir)/doc/docinfo.html
 	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_quickstart.es.html $(abs_top_srcdir)/doc/es/weechat_quickstart.es.adoc