39 files changed, 40 insertions, 40 deletions
diff --git a/Makefile.in b/Makefile.in
index 6e3d103..81a4e13 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/configure b/configure
index 4162d2d..b1b04af 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/doc/info/hardcopy-copying.texinfo b/doc/info/hardcopy-copying.texinfo
index 39cf8ee..162b7d0 100644
--- a/doc/info/hardcopy-copying.texinfo
+++ b/doc/info/hardcopy-copying.texinfo
@@ -31,7 +31,7 @@ Printed by:
 X
 
 @*@*
-Copyright @copyright{} 2015  Mattias Andrée @e{maandree@@member.fsf.org}
+Copyright @copyright{} 2015  Mattias Andrée @e{m@@maandree.se}
 @*
 
 @c The copyright information from the main file, add any required
diff --git a/doc/info/sat.texinfo b/doc/info/sat.texinfo
index 391c934..6d447a6 100644
--- a/doc/info/sat.texinfo
+++ b/doc/info/sat.texinfo
@@ -4,7 +4,7 @@
 @include reusable/macros.texinfo
 @copying
 @c --------------------------------------------------------------------------------
-Copyright @copyright{} 2015  @w{Mattias Andrée @e{maandree@@member.fsf.org}}
+Copyright @copyright{} 2015  @w{Mattias Andrée @e{m@@maandree.se}}
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/man/sat.1 b/doc/man/sat.1
index 93854b6..25a822f 100644
--- a/doc/man/sat.1
+++ b/doc/man/sat.1
@@ -222,4 +222,4 @@ list of authors.
 MIT/Expat License.
 .SH BUGS
 Please report bugs to https://github.com/maandree/sat/issues or to
-maandree@member.fsf.org
+m@maandree.se
diff --git a/doc/man/satd.1 b/doc/man/satd.1
index d86c43a..aad279c 100644
--- a/doc/man/satd.1
+++ b/doc/man/satd.1
@@ -81,4 +81,4 @@ list of authors.
 MIT/Expat License.
 .SH BUGS
 Please report bugs to https://github.com/maandree/sat/issues or to
-maandree@member.fsf.org
+m@maandree.se
diff --git a/doc/man/satq.1 b/doc/man/satq.1
index 082a7ac..9b815ad 100644
--- a/doc/man/satq.1
+++ b/doc/man/satq.1
@@ -119,4 +119,4 @@ list of authors.
 MIT/Expat License.
 .SH BUGS
 Please report bugs to https://github.com/maandree/sat/issues or to
-maandree@member.fsf.org
+m@maandree.se
diff --git a/doc/man/satr.1 b/doc/man/satr.1
index d3ebb4a..b806a9c 100644
--- a/doc/man/satr.1
+++ b/doc/man/satr.1
@@ -45,4 +45,4 @@ list of authors.
 MIT/Expat License.
 .SH BUGS
 Please report bugs to https://github.com/maandree/sat/issues or to
-maandree@member.fsf.org
+m@maandree.se
diff --git a/doc/man/satrm.1 b/doc/man/satrm.1
index 8e2633d..0df14e9 100644
--- a/doc/man/satrm.1
+++ b/doc/man/satrm.1
@@ -42,4 +42,4 @@ list of authors.
 MIT/Expat License.
 .SH BUGS
 Please report bugs to https://github.com/maandree/sat/issues or to
-maandree@member.fsf.org
+m@maandree.se
diff --git a/mk/all.mk b/mk/all.mk
index 2caa569..ace9be1 100644
--- a/mk/all.mk
+++ b/mk/all.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/clean.mk b/mk/clean.mk
index d0a97c4..e87a39d 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/configure b/mk/configure
index b3b1b7c..2110e21 100644
--- a/mk/configure
+++ b/mk/configure
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/copy.mk b/mk/copy.mk
index 1579193..3aa4bd0 100644
--- a/mk/copy.mk
+++ b/mk/copy.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/dist.mk b/mk/dist.mk
index b6db9e6..814bb12 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/empty.mk b/mk/empty.mk
index 81c06fb..c7109a3 100644
--- a/mk/empty.mk
+++ b/mk/empty.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/i18n.mk b/mk/i18n.mk
index cc27903..58b7a58 100644
--- a/mk/i18n.mk
+++ b/mk/i18n.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/lang-c.mk b/mk/lang-c.mk
index 5bc5197..94e84ac 100644
--- a/mk/lang-c.mk
+++ b/mk/lang-c.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/lowerpath.mk b/mk/lowerpath.mk
index aadb91f..126f8a6 100644
--- a/mk/lowerpath.mk
+++ b/mk/lowerpath.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/man.mk b/mk/man.mk
index 8105249..00ca1fd 100644
--- a/mk/man.mk
+++ b/mk/man.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/path.mk b/mk/path.mk
index a65b7b8..1efb4f1 100644
--- a/mk/path.mk
+++ b/mk/path.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/prologue.mk b/mk/prologue.mk
index 525da28..4d8ff70 100644
--- a/mk/prologue.mk
+++ b/mk/prologue.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/shell.mk b/mk/shell.mk
index 853e368..3b7cd08 100644
--- a/mk/shell.mk
+++ b/mk/shell.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/tags.mk b/mk/tags.mk
index a7c695b..a3bbb51 100644
--- a/mk/tags.mk
+++ b/mk/tags.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index ef7f3cb..38556bf 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/mk/tools.mk b/mk/tools.mk
index 63d6d66..0fc68bf 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Mattias Andrée <maandree@member.fsf.org>
+# Copyright (C) 2015  Mattias Andrée <m@maandree.se>
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/src/README b/src/README
index ec48c8d..5e36a7f 100644
--- a/src/README
+++ b/src/README
@@ -11,7 +11,7 @@ satd-timer.c       The part of satd responsible for running expired jobs and set
 parse_time.[ch]    Use by sat.c to parse the time argument.
                    Only rudimentary parsing is done.
 
-daemonise.[ch]     From <http://github.com/maandree/slibc>;
+daemonise.[ch]     From <http://codeberg.org/maandree/slibc>;
                    daemonisation of the process. Used by satd.c
 
 common.[ch]        Used by sat{q,r,rm,d*}.c, some shared code.
diff --git a/src/common.c b/src/common.c
index 6423937..2c6c7b4 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/common.h b/src/common.h
index 0808e11..408124e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/daemonise.c b/src/daemonise.c
index be7e33e..4f7274c 100644
--- a/src/daemonise.c
+++ b/src/daemonise.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * This file is copied from <http://github.com/maandree/slibc>,
+ * This file is copied from <http://codeberg.org/maandree/slibc>,
  * but with unused stuff removed. It has also been slightly modified
  * and changed code style (these "slight" modifications do not change
  * the behaviour.)
diff --git a/src/daemonise.h b/src/daemonise.h
index c318d60..43156e8 100644
--- a/src/daemonise.h
+++ b/src/daemonise.h
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/parse_time.c b/src/parse_time.c
index 4d4e92d..2119798 100644
--- a/src/parse_time.c
+++ b/src/parse_time.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/parse_time.h b/src/parse_time.h
index 4b8ada3..3dd48f6 100644
--- a/src/parse_time.h
+++ b/src/parse_time.h
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/sat.c b/src/sat.c
index ad4e05d..fddae4d 100644
--- a/src/sat.c
+++ b/src/sat.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/satd-diminished.c b/src/satd-diminished.c
index 811c545..9e8ce1e 100644
--- a/src/satd-diminished.c
+++ b/src/satd-diminished.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/satd-timer.c b/src/satd-timer.c
index 86feb6a..5e14411 100644
--- a/src/satd-timer.c
+++ b/src/satd-timer.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/satd.c b/src/satd.c
index 4e2b981..a17fa1a 100644
--- a/src/satd.c
+++ b/src/satd.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/satq.c b/src/satq.c
index 6261a4f..e22d477 100644
--- a/src/satq.c
+++ b/src/satq.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/satr.c b/src/satr.c
index 583bd68..ff1a6da 100644
--- a/src/satr.c
+++ b/src/satr.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/satrm.c b/src/satrm.c
index ac3b5fc..e67245a 100644
--- a/src/satrm.c
+++ b/src/satrm.c
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015, 2016  Mattias Andrée <maandree@member.fsf.org>
+ * Copyright © 2015, 2016  Mattias Andrée <m@maandree.se>
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),