diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 7be631a773db599c996c9d91616055afe0d5681d..bb8e1ed29f70958583ecc506faad9899b3ae57fe 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -139,6 +139,16 @@ Checking GitLab ... Finished
 ```
 
 
+### (Re-)Create satellite repos
+
+This will create satellite repos for all your projects.
+If necessary, remove the `tmp/repo_satellites` directory and rerun the command below.
+
+```
+bundle exec rake gitlab:satellites:create
+```
+
+
 ### Rebuild each key at gitolite config
 
 This will send all users ssh public keys to gitolite and grant them access (based on their permission) to their projects.
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 20d65e6e0d0e7581f56021fd712d4cb377036c04..baa706d2beef05ff8d9c668a32900d16048be81d 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -192,7 +192,9 @@ namespace :gitlab do
         else
           puts "no".red
           try_fixing_it(
-            "sudo -u gitlab -H bundle exec rake gitlab:enable_automerge"
+            "sudo -u gitlab -H bundle exec rake gitlab:satellites:create",
+            "If necessary, remove the tmp/repo_satellites directory ...",
+            "... and rerun the above command"
           )
           for_more_information(
             "doc/raketasks/maintenance.md "
diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake
index a543a8a73853357de1c4ff0420fe468ad07ea519..ed3d6368a998d1aae98f67ecd75983838adb578b 100644
--- a/lib/tasks/gitlab/enable_automerge.rake
+++ b/lib/tasks/gitlab/enable_automerge.rake
@@ -12,4 +12,9 @@ namespace :gitlab do
 
     puts "Done!".green
   end
+
+  namespace :satellites do
+    desc "GITLAB | Create satellite repos"
+    task create: 'gitlab:enable_automerge'
+  end
 end