diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..a7eb301110
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,11 @@
+Christian Schulte <schulte@gecode.dev> <schulte@gecode.org>
+Christian Schulte <schulte@gecode.dev> <cschulte@kth.se>
+Christian Schulte <schulte@gecode.dev> <cschulte@sics.se>
+
+Guido Tack <tack@gecode.dev> <tack@gecode.org>
+Guido Tack <tack@gecode.dev> <guido.tack@monash.edu>
+Guido Tack <tack@gecode.dev> <guido.tack@me.com>
+
+Mikael Zayenz Lagerkvist <lagerkvist@gecode.dev> <lagerkvist@gecode.org>
+Mikael Zayenz Lagerkvist <lagerkvist@gecode.dev> <zayenz@gecode.org>
+Mikael Zayenz Lagerkvist <lagerkvist@gecode.dev> <zayenz@gmail.com>
diff --git a/gecode/flatzinc/blackbox-backend.cpp b/gecode/flatzinc/blackbox-backend.cpp
index b8967f0a11..bdfcf6178e 100644
--- a/gecode/flatzinc/blackbox-backend.cpp
+++ b/gecode/flatzinc/blackbox-backend.cpp
@@ -11,7 +11,7 @@
  *
  *  This file is part of Gecode, the generic constraint
  *  development environment:
- *     http://www.gecode.org
+ *     http://www.gecode.dev
  *
  *  Permission is hereby granted, free of charge, to any person obtaining
  *  a copy of this software and associated documentation files (the
diff --git a/gecode/flatzinc/blackbox-backend.hh b/gecode/flatzinc/blackbox-backend.hh
index 642612d908..4ff809a37e 100644
--- a/gecode/flatzinc/blackbox-backend.hh
+++ b/gecode/flatzinc/blackbox-backend.hh
@@ -11,7 +11,7 @@
  *
  *  This file is part of Gecode, the generic constraint
  *  development environment:
- *     http://www.gecode.org
+ *     http://www.gecode.dev
  *
  *  Permission is hereby granted, free of charge, to any person obtaining
  *  a copy of this software and associated documentation files (the
diff --git a/gecode/flatzinc/blackbox-propagator.cpp b/gecode/flatzinc/blackbox-propagator.cpp
index 3e58dc9ddd..8b29483f47 100644
--- a/gecode/flatzinc/blackbox-propagator.cpp
+++ b/gecode/flatzinc/blackbox-propagator.cpp
@@ -11,7 +11,7 @@
  *
  *  This file is part of Gecode, the generic constraint
  *  development environment:
- *     http://www.gecode.org
+ *     http://www.gecode.dev
  *
  *  Permission is hereby granted, free of charge, to any person obtaining
  *  a copy of this software and associated documentation files (the
diff --git a/gecode/flatzinc/blackbox.hh b/gecode/flatzinc/blackbox.hh
index 6533cefa1c..cf5d589a1a 100644
--- a/gecode/flatzinc/blackbox.hh
+++ b/gecode/flatzinc/blackbox.hh
@@ -11,7 +11,7 @@
  *
  *  This file is part of Gecode, the generic constraint
  *  development environment:
- *     http://www.gecode.org
+ *     http://www.gecode.dev
  *
  *  Permission is hereby granted, free of charge, to any person obtaining
  *  a copy of this software and associated documentation files (the