diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index eec6269ac..268378b2f 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -54,6 +54,10 @@
 (require 'org-install)
 (require 'hoa-mode)
 
+; See https://github.com/emacs-ess/ESS/issues/1052
+(setq ess-gen-proc-buffer-name-function 'ess-gen-proc-buffer-name:directory)
+(setq ess-use-flymake nil)
+
 (setq org-export-htmlize-output-type 'css)
 (setq org-html-htmlize-output-type 'css)
 ; the .org-timestamp directory does not always exist, is not always