diff --git a/.dir-locals.el b/.dir-locals.el
index 90a4125fe..65478666b 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,6 +2,11 @@
 	 (whitespace-style face empty trailing lines-tail)
 	 (require-final-newline . t)
 	 (mode . global-whitespace)
+         (bug-reference-bug-regexp
+          . "\\(?:[Ff]ix\\(es\\)? \\|[Ii]ssue \\)#\\(?2:[0-9]+\\)")
+         (bug-reference-url-format
+          . "https://gitlab.lrde.epita.fr/spot/spot/issues/%s")
+	 (mode . bug-reference)
          (magit-branch-adjust-remote-upstream-alist ("origin/next" . "/"))))
  (c++-mode . ((c-default-style . "gnu")
 	      (indent-tab-mode . t)
diff --git a/HACKING b/HACKING
index df1dae365..edab0fcc5 100644
--- a/HACKING
+++ b/HACKING
@@ -389,6 +389,16 @@ Comments
   * Prefer C++-style comments (// foo) to C-style comments (/* foo */).
     Use /// for Doxygen comments.
 
+  * When mentioning an issue number, in comments as well as in commit
+    messages, use one of the following forms so that we can configure
+    our editors to turn these into hyperlinks.
+
+       Issue #123 / issue #123 / Fixes #123 / fixes #123
+
+    (When gitlab sees a commit message containing "Fixes #123" or
+    "fixes #123" pushed to branch "next", it will automatically close
+    the issue.)
+
 Formating
 ---------
 
diff --git a/tests/core/remfin.test b/tests/core/remfin.test
index 48b720cbd..794154efe 100755
--- a/tests/core/remfin.test
+++ b/tests/core/remfin.test
@@ -205,7 +205,7 @@ deterministic complete stutter-insensitive comment: "Safra[NBA=3]"
 acc-name: Rabin 2 Acceptance: 4 (Fin(0)&Inf(1))|(Fin(2)&Inf(3)) Start:
 1 AP: 2 "p0" "p1" --BODY-- State: 0 {2} 2 0 2 3 State: 1 {0 2} 2 1 2 2
 State: 2 {1 2} 2 0 2 2 State: 3 {3} 2 0 2 3 --END--
-/* This is the square of smaller.hoa from #188. */
+/* This is the square of smaller.hoa from issue #188. */
 HOA: v1 States: 37 Start: 0 AP: 2 "a" "b" Acceptance: 24 (Inf(11) |
 Fin(5)) & (Inf(10) | Fin(4)) & (Inf(9) | Fin(3)) & (Inf(8) | Fin(2)) &
 (Inf(7) | Fin(1)) & (Inf(6) | Fin(0)) & (Inf(23) | Fin(17)) & (Inf(22)
@@ -262,7 +262,7 @@ trans-acc --BODY-- State: 0 [!0&1] 5 [!0&1] 7 State: 1 [0&!1] 2 {2}
 [!0&1] 4 State: 7 [0&!1] 8 {3} [!0&!1] 7 {2} [0&!1] 3 {2} [!0&1] 5 {1}
 State: 8 [!0&1] 8 {2} [!0&!1] 3 {1} [!0&1] 4 State: 9 [0&!1] 6 {0 3}
 [!0&1] 2 --END--
-/* Exposed the bug from #279 */
+/* Exposed the bug from issue #279 */
 HOA: v1 States: 3 Start: 0 AP: 2 "b" "c" Acceptance: 3 Fin(0) &
 (Inf(1)&Inf(2)) properties: trans-labels explicit-labels trans-acc
 complete --BODY-- State: 0 [!0] 0 {1 2} [0] 0 {0 1 2} [0&!1] 1 [0&1] 2
diff --git a/tests/core/unambig.test b/tests/core/unambig.test
index 25c52752d..a0ffa7954 100755
--- a/tests/core/unambig.test
+++ b/tests/core/unambig.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013, 2015-2017 Laboratoire de Recherche et
+# Copyright (C) 2013, 2015-2018 Laboratoire de Recherche et
 # Developpement de l'Epita
 #
 # This file is part of Spot, a model checking library.
@@ -244,9 +244,9 @@ diff expected ltlcross.res
 
 
 # This automaton was supplied by František Blahoudek, and is discussed
-# in #188.  Our initial implementation of is_unambiguous() on this
-# automaton used to take 38s, while the new version takes 0.2s.  Using
-# valgrind on this is a way to ensure that the test is procedure
+# in issue #188.  Our initial implementation of is_unambiguous() on
+# this automaton used to take 38s, while the new version takes 0.2s.
+# Using valgrind on this is a way to ensure that the test is procedure
 # enough: it would have been too long on the previous version.
 
 cat >smaller.hoa<<EOF