diff --git a/.xinitrc.emacs b/.xinitrc.emacs
deleted file mode 100644
index 3128159..0000000
--- a/.xinitrc.emacs
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-xhost +SI:localuser:$USER
-wmname LG3D
-
-# Set fallback cursor
-xsetroot -cursor_name left_ptr
-
-# If Emacs is started in server mode, `emacsclient` is a convenient way to edit
-# files in place (used by e.g. `git commit`)
-export _JAVA_AWT_WM_NONREPARENTING=1
-export VISUAL=emacsclient
-export EDITOR="$VISUAL"
-
-exec emacs --with-exwm
diff --git a/.xinitrc.stumpwm b/.xinitrc.stumpwm
deleted file mode 100644
index ee2fde6..0000000
--- a/.xinitrc.stumpwm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# this makes it work in Ubuntu
-xhost +SI:localuser:$USER
-
-# wmname LG3D
-# export _JAVA_AWT_WM_NONREPARENTING=1
-
-exec stumpwm
diff --git a/org/config/Deprecated/awesome.org b/org/config/Deprecated/awesome.org
index 9482f6c..3936d44 100644
--- a/org/config/Deprecated/awesome.org
+++ b/org/config/Deprecated/awesome.org
@@ -26,6 +26,17 @@ This document was written in Emacs with Org-mode and is both the documentation
 and source code of my configuration file which can be extracted to
 ~$HOME/.config/awesome/rc.lua~ through a call to ~org-babel-tangle~.
 
+* Launching Awesome
+:PROPERTIES:
+:CUSTOM_ID: Launching-Awesome-lavgvvz00bj0
+:END:
+In order to launch Awesome with ~startx~, I need a ~xinit~-compatible
+script. Here is my ~$HOME/.xinitrc.awesome~ file:
+#+begin_src sh :tangle ~/.xinitrc.awesome
+xhost +
+exec awesome
+#+end_src
+
 * Loading libraries
 :PROPERTIES:
 :CUSTOM_ID: Loading_libraries-4df76999
diff --git a/org/config/emacs.org b/org/config/emacs.org
index 6255bcc..7bd1faf 100644
--- a/org/config/emacs.org
+++ b/org/config/emacs.org
@@ -3234,6 +3234,28 @@ easily.
     (apply #'call-process `(,(car command-parts) nil 0 nil ,@(cdr command-parts)))))
 #+end_src
 
+In order to launch Emacs with EXWM with ~startx~, I need a ~xinit~ file.
+This one is exported to ~$HOME/.xinitrc.emacs~.
+#+begin_src sh :tangle ~/.xinitrc.emacs
+#!/bin/sh
+
+xhost +SI:localuser:$USER
+
+# Set fallback cursor
+xsetroot -cursor_name left_ptr
+
+# If Emacs is started in server mode, `emacsclient` is a convenient way to edit
+# files in place (used by e.g. `git commit`)
+export VISUAL=emacsclient
+export EDITOR="$VISUAL"
+
+# in case Java applications display /nothing/
+# wmname LG3D
+# export _JAVA_AWT_WM_NONREPARENTING=1
+
+exec emacs --with-exwm
+#+end_src
+
 *** EXWM itself
 :PROPERTIES:
 :CUSTOM_ID: Packages-Configuration-EXWM-EXWM-itself-hhgexz61aaj0
diff --git a/org/config/stumpwm.org b/org/config/stumpwm.org
index fcdcbce..6378653 100644
--- a/org/config/stumpwm.org
+++ b/org/config/stumpwm.org
@@ -87,6 +87,28 @@ follows this architecture:
 - ~theme.lisp~ :: manages the color theme of StumpWM, the default
   placement of some windows and StumpWM’s gaps.
 
+You will also find below my ~xinit~ file for StumpWM, exported to
+~$HOME/.xinitrc.stumpwm~, which I use to start Stump through ~startx
+~/.xinitrc.stumpwm~.
+#+begin_src sh :tangle ~/.xinitrc.stumpwm
+#!/bin/sh
+
+# this makes it work in Ubuntu
+xhost +SI:localuser:$USER
+
+# Set fallback pointer
+xsetroot -cursor_name left_ptr
+
+# Fix scrolling on some GTK3 applications
+export GDK_CORE_DEVICE_EVENTS=1
+
+# in case Java applications display /nothing/
+# wmname LG3D
+# export _JAVA_AWT_WM_NONREPARENTING=1
+
+exec stumpwm
+#+end_src
+
 * Init file
 :PROPERTIES:
 :CUSTOM_ID: Init-file-l3q4snd1u5j0