diff --git a/generator/generate b/generator/generate
index 92bf486bf1051dc124ecd7c9d0cb14ea7a83dee2..a9347fc4ff472f8f6a7d7cfc7ec6cd9e6e25d280 100755
Binary files a/generator/generate and b/generator/generate differ
diff --git a/generator/html_generator.ml b/generator/html_generator.ml
index 9563a32d1eb1b7f16bf649c504264a17309e9ee1..93e2b169ef79dfaf7911418e9edfb337fafe0e06 100755
--- a/generator/html_generator.ml
+++ b/generator/html_generator.ml
@@ -40,9 +40,9 @@ let print_word fmt = function
   | PrivateBts n ->
       Format.fprintf fmt "<a class=\"private\" href=\"%s%d\">#%d</a>"
 	"http://bts.frama-c.com/view.php?id=" n n
-  | Gitlab n ->
-    Format.fprintf fmt "<a class=\"private\" href=\"%s%d\">#%d</a>"
-      "https://git.frama-c.com/frama-c/frama-c/issues/" n n
+  | Gitlab(pub, s, n) ->
+    Format.fprintf fmt "<a class=\"private\" href=\"%s/%s/%s/%s/%d\">#%d</a>"
+      "https://git.frama-c.com" (if pub then "pub" else "frama-c") s "issues" n n
   | OldBts n ->
       Format.fprintf fmt "<code>'%d'</code>" n
 
diff --git a/generator/lexer.mll b/generator/lexer.mll
index 59def45fdec00faf025aef85a319519700271c4e..7bb314e1d4d5b36f2f4abebf4f3a689ee8c51c05 100755
--- a/generator/lexer.mll
+++ b/generator/lexer.mll
@@ -26,7 +26,7 @@
     | PublicBts of int
     | PrivateBts of int
     | OldBts of int
-    | Gitlab of int
+    | Gitlab of bool * string * int
     | Item of char
     | Space
     | Newline
@@ -43,6 +43,7 @@
     "ACSL";
     "Cil";
     "Configure";
+    "Dev";
     "Doc";
     "Journal";
     "Kernel";
@@ -176,6 +177,9 @@ and text e = parse
 
   (* | space+ (digit as k) ')' { add_word e (Item k) ; text e lexbuf } *)
 
+  | "frama-c/" ((letter+) as sub) '#' ((digit+) as bug)
+      { add_word e (Gitlab(false, sub, int_of_string bug)) ; text e lexbuf }
+
   | '#' ((digit+) as bug)
       { add_word e (PublicBts(int_of_string bug)) ; text e lexbuf }
 
@@ -186,7 +190,10 @@ and text e = parse
       { add_word e (OldBts(int_of_string bug)) ; text e lexbuf }
 
   | "#@" ((digit+) as bug)
-      { add_word e (Gitlab(int_of_string bug)) ; text e lexbuf }
+      { add_word e (Gitlab(false, "frama-c", int_of_string bug)) ; text e lexbuf }
+
+  | "##" ((digit+) as bug)
+      { add_word e (Gitlab(true, "frama-c", int_of_string bug)) ; text e lexbuf }
 
   | '-' (letter | '-')+
   | '!'? (upper ident* '.')+ ident+