diff --git a/.githooks/post-merge b/.githooks/post-merge
new file mode 100755
index 0000000000000000000000000000000000000000..75d4c2094585f65a309edf7317efc93baf93bf0f
--- /dev/null
+++ b/.githooks/post-merge
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eu
+. .bashrc
+gen-ssh-config
diff --git a/README.rst b/README.rst
index a7a8c592a62c19d30186cde2e28a2a8c9524a106..ab4805cc3c3635bbd4e3fc823addfbb9a34a0c98 100644
--- a/README.rst
+++ b/README.rst
@@ -20,6 +20,9 @@ WARNING: This will overwrite your existing files.
     cd ..
     rm -r rcfiles
     git submodule update --init --recursive
+    cd .githooks/
+    find  -type f -exec ln -sf ../../.githooks/{} ../.git/hooks/ \;
+    cd ../
 
 In older versions of Git the paths in the submodules are obsolete and thus need
 to be corrected (before fetching them). The correction needs to be done in the