summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--doc/mpd.12
-rw-r--r--m4/ucred.m42
-rw-r--r--src/CommandLine.cxx2
-rw-r--r--src/java/Class.hxx2
-rw-r--r--src/java/Exception.hxx2
-rw-r--r--src/java/File.cxx2
-rw-r--r--src/java/File.hxx2
-rw-r--r--src/java/Global.cxx2
-rw-r--r--src/java/Global.hxx2
-rw-r--r--src/java/Object.hxx2
-rw-r--r--src/java/Ref.hxx2
-rw-r--r--src/java/String.cxx2
-rw-r--r--src/java/String.hxx2
-rw-r--r--src/lib/curl/Easy.hxx2
-rw-r--r--src/lib/curl/Global.cxx2
-rw-r--r--src/lib/curl/Global.hxx2
-rw-r--r--src/lib/curl/Handler.hxx2
-rw-r--r--src/lib/curl/Multi.hxx2
-rw-r--r--src/lib/curl/Request.cxx2
-rw-r--r--src/lib/curl/Request.hxx2
-rw-r--r--src/lib/curl/Slist.hxx2
-rw-r--r--src/lib/curl/Version.cxx2
-rw-r--r--src/lib/curl/Version.hxx2
-rw-r--r--src/net/AllocatedSocketAddress.cxx2
-rw-r--r--src/net/AllocatedSocketAddress.hxx2
-rw-r--r--src/net/SocketAddress.cxx2
-rw-r--r--src/net/SocketAddress.hxx2
-rw-r--r--src/net/StaticSocketAddress.cxx2
-rw-r--r--src/net/StaticSocketAddress.hxx2
-rw-r--r--src/net/ToString.cxx2
-rw-r--r--src/net/ToString.hxx2
-rw-r--r--src/output/plugins/sles/AndroidSimpleBufferQueue.hxx2
-rw-r--r--src/output/plugins/sles/Engine.hxx2
-rw-r--r--src/output/plugins/sles/Object.hxx2
-rw-r--r--src/output/plugins/sles/Play.hxx2
-rw-r--r--src/system/ByteOrder.hxx2
-rw-r--r--src/system/Error.hxx2
-rw-r--r--src/system/FileDescriptor.cxx2
-rw-r--r--src/system/FileDescriptor.hxx2
-rw-r--r--src/thread/Cond.hxx2
-rw-r--r--src/thread/CriticalSection.hxx2
-rw-r--r--src/thread/Mutex.hxx2
-rw-r--r--src/thread/PosixCond.hxx2
-rw-r--r--src/thread/PosixMutex.hxx2
-rw-r--r--src/thread/Util.cxx2
-rw-r--r--src/thread/Util.hxx2
-rw-r--r--src/thread/WindowsCond.hxx2
-rw-r--r--src/util/ASCII.hxx2
-rw-r--r--src/util/AllocatedArray.hxx2
-rw-r--r--src/util/AllocatedString.cxx2
-rw-r--r--src/util/AllocatedString.hxx2
-rw-r--r--src/util/BindMethod.hxx2
-rw-r--r--src/util/Cast.hxx2
-rw-r--r--src/util/CharUtil.hxx2
-rw-r--r--src/util/CircularBuffer.hxx2
-rw-r--r--src/util/Clamp.hxx2
-rw-r--r--src/util/ConstBuffer.hxx2
-rw-r--r--src/util/DeleteDisposer.hxx2
-rw-r--r--src/util/Domain.hxx2
-rw-r--r--src/util/DynamicFifoBuffer.hxx2
-rw-r--r--src/util/Exception.cxx2
-rw-r--r--src/util/Exception.hxx2
-rw-r--r--src/util/ForeignFifoBuffer.hxx2
-rw-r--r--src/util/HugeAllocator.cxx2
-rw-r--r--src/util/HugeAllocator.hxx2
-rw-r--r--src/util/IterableSplitString.hxx2
-rw-r--r--src/util/Macros.hxx2
-rw-r--r--src/util/Manual.hxx2
-rw-r--r--src/util/NumberParser.hxx2
-rw-r--r--src/util/ReusableArray.hxx2
-rw-r--r--src/util/RuntimeError.hxx2
-rw-r--r--src/util/ScopeExit.hxx2
-rw-r--r--src/util/SplitString.cxx2
-rw-r--r--src/util/SplitString.hxx2
-rw-r--r--src/util/StaticFifoBuffer.hxx2
-rw-r--r--src/util/StringAPI.hxx2
-rw-r--r--src/util/StringCompare.cxx2
-rw-r--r--src/util/StringCompare.hxx2
-rw-r--r--src/util/StringPointer.hxx2
-rw-r--r--src/util/StringView.cxx2
-rw-r--r--src/util/StringView.hxx2
-rw-r--r--src/util/TextFile.hxx2
-rw-r--r--src/util/TimeParser.cxx2
-rw-r--r--src/util/TimeParser.hxx2
-rw-r--r--src/util/Tokenizer.cxx2
-rw-r--r--src/util/Tokenizer.hxx2
-rw-r--r--src/util/UTF8.cxx2
-rw-r--r--src/util/UTF8.hxx2
-rw-r--r--src/util/VarSize.hxx2
-rw-r--r--src/util/WStringAPI.hxx2
-rw-r--r--src/util/WStringCompare.hxx2
-rw-r--r--src/util/WritableBuffer.hxx2
93 files changed, 93 insertions, 93 deletions
diff --git a/AUTHORS b/AUTHORS
index 605f2ef40..e4582d0ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ The following people have contributed code to MPD:
Warren Dukes <warren.dukes@gmail.com>
Avuton Olrich <avuton@gmail.com>
- Max Kellermann <max@duempel.org>
+ Max Kellermann <max.kellermann@gmail.com>
Laszlo Ashin <kodest@gmail.com>
Viliam Mateicka <viliam.mateicka@gmail.com>
Eric Wollesen <encoded@xmtp.net>
diff --git a/doc/mpd.1 b/doc/mpd.1
index 7acc6e943..5bc613fd4 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -50,6 +50,6 @@ If you find a bug, please report it at
.br
<\fBhttp://bugs.musicpd.org/bug_report_page.php\fP>.
.SH AUTHORS
-Max Kellermann <max@duempel.org>
+Max Kellermann <max.kellermann@gmail.com>
Special thanks to all the people that provided feedback and patches.
diff --git a/m4/ucred.m4 b/m4/ucred.m4
index f53649985..08afce5c0 100644
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -1,6 +1,6 @@
# Check if "struct ucred" is available.
#
-# Author: Max Kellermann <max@duempel.org>
+# Author: Max Kellermann <max.kellermann@gmail.com>
AC_DEFUN([STRUCT_UCRED],[
AC_MSG_CHECKING([for struct ucred])
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index d571fd397..9429af528 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -107,7 +107,7 @@ static void version(void)
"\n"
"\n"
"Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
- "Copyright 2008-2017 Max Kellermann <max@duempel.org>\n"
+ "Copyright 2008-2017 Max Kellermann <max.kellermann@gmail.com>\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/src/java/Class.hxx b/src/java/Class.hxx
index 9496ee67d..44425d1b7 100644
--- a/src/java/Class.hxx
+++ b/src/java/Class.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/Exception.hxx b/src/java/Exception.hxx
index adbdebb47..b4835e904 100644
--- a/src/java/Exception.hxx
+++ b/src/java/Exception.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2012 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2012 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/File.cxx b/src/java/File.cxx
index 8e9599dfc..7cd447bfc 100644
--- a/src/java/File.cxx
+++ b/src/java/File.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/File.hxx b/src/java/File.hxx
index a569fe214..8822e5321 100644
--- a/src/java/File.hxx
+++ b/src/java/File.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/Global.cxx b/src/java/Global.cxx
index 1d1160127..58aa9e422 100644
--- a/src/java/Global.cxx
+++ b/src/java/Global.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/Global.hxx b/src/java/Global.hxx
index 5fdf91daf..49c7bc6f8 100644
--- a/src/java/Global.hxx
+++ b/src/java/Global.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/Object.hxx b/src/java/Object.hxx
index 226ad7623..4e6220a48 100644
--- a/src/java/Object.hxx
+++ b/src/java/Object.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/Ref.hxx b/src/java/Ref.hxx
index e9966f1c6..a6f2d5d84 100644
--- a/src/java/Ref.hxx
+++ b/src/java/Ref.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/String.cxx b/src/java/String.cxx
index 8ffb82d72..c2525cc20 100644
--- a/src/java/String.cxx
+++ b/src/java/String.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/java/String.hxx b/src/java/String.hxx
index a58385f50..4832a905b 100644
--- a/src/java/String.hxx
+++ b/src/java/String.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2011 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Easy.hxx b/src/lib/curl/Easy.hxx
index decb5771f..0e51b159c 100644
--- a/src/lib/curl/Easy.hxx
+++ b/src/lib/curl/Easy.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Global.cxx b/src/lib/curl/Global.cxx
index 1033c7ae6..12a8f638a 100644
--- a/src/lib/curl/Global.cxx
+++ b/src/lib/curl/Global.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Global.hxx b/src/lib/curl/Global.hxx
index 8669234c2..8c6b80ebe 100644
--- a/src/lib/curl/Global.hxx
+++ b/src/lib/curl/Global.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Handler.hxx b/src/lib/curl/Handler.hxx
index 99d0b11af..1012af5bf 100644
--- a/src/lib/curl/Handler.hxx
+++ b/src/lib/curl/Handler.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Multi.hxx b/src/lib/curl/Multi.hxx
index feda398b7..9cb4e7a8e 100644
--- a/src/lib/curl/Multi.hxx
+++ b/src/lib/curl/Multi.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Request.cxx b/src/lib/curl/Request.cxx
index a5163dcaf..3b619dacf 100644
--- a/src/lib/curl/Request.cxx
+++ b/src/lib/curl/Request.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Request.hxx b/src/lib/curl/Request.hxx
index 93e254310..fa1d01c3e 100644
--- a/src/lib/curl/Request.hxx
+++ b/src/lib/curl/Request.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Slist.hxx b/src/lib/curl/Slist.hxx
index d3cc34710..d0c458e38 100644
--- a/src/lib/curl/Slist.hxx
+++ b/src/lib/curl/Slist.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Version.cxx b/src/lib/curl/Version.cxx
index 46132b5fe..94a248b61 100644
--- a/src/lib/curl/Version.cxx
+++ b/src/lib/curl/Version.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/lib/curl/Version.hxx b/src/lib/curl/Version.hxx
index 0b4f13707..21b5164e5 100644
--- a/src/lib/curl/Version.hxx
+++ b/src/lib/curl/Version.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/AllocatedSocketAddress.cxx b/src/net/AllocatedSocketAddress.cxx
index 09264456b..d109eac8d 100644
--- a/src/net/AllocatedSocketAddress.cxx
+++ b/src/net/AllocatedSocketAddress.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/AllocatedSocketAddress.hxx b/src/net/AllocatedSocketAddress.hxx
index c865d17dd..af015a387 100644
--- a/src/net/AllocatedSocketAddress.hxx
+++ b/src/net/AllocatedSocketAddress.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/SocketAddress.cxx b/src/net/SocketAddress.cxx
index 38aeb8d6d..10609269c 100644
--- a/src/net/SocketAddress.cxx
+++ b/src/net/SocketAddress.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/SocketAddress.hxx b/src/net/SocketAddress.hxx
index 0577edd72..31d513609 100644
--- a/src/net/SocketAddress.hxx
+++ b/src/net/SocketAddress.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/StaticSocketAddress.cxx b/src/net/StaticSocketAddress.cxx
index 94db4a49c..70237fd48 100644
--- a/src/net/StaticSocketAddress.cxx
+++ b/src/net/StaticSocketAddress.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/StaticSocketAddress.hxx b/src/net/StaticSocketAddress.hxx
index c8cef9dfe..620b74e1d 100644
--- a/src/net/StaticSocketAddress.hxx
+++ b/src/net/StaticSocketAddress.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/ToString.cxx b/src/net/ToString.cxx
index 1acf0320b..7df2cb07a 100644
--- a/src/net/ToString.cxx
+++ b/src/net/ToString.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/net/ToString.hxx b/src/net/ToString.hxx
index 4b676008a..a221c6c06 100644
--- a/src/net/ToString.hxx
+++ b/src/net/ToString.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/output/plugins/sles/AndroidSimpleBufferQueue.hxx b/src/output/plugins/sles/AndroidSimpleBufferQueue.hxx
index c7dd4ccca..cd60414aa 100644
--- a/src/output/plugins/sles/AndroidSimpleBufferQueue.hxx
+++ b/src/output/plugins/sles/AndroidSimpleBufferQueue.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2012 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/output/plugins/sles/Engine.hxx b/src/output/plugins/sles/Engine.hxx
index 7c6e3cf50..e8d336193 100644
--- a/src/output/plugins/sles/Engine.hxx
+++ b/src/output/plugins/sles/Engine.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2012 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/output/plugins/sles/Object.hxx b/src/output/plugins/sles/Object.hxx
index 852d62d0d..333095923 100644
--- a/src/output/plugins/sles/Object.hxx
+++ b/src/output/plugins/sles/Object.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2012 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/output/plugins/sles/Play.hxx b/src/output/plugins/sles/Play.hxx
index c760151ef..17efd662d 100644
--- a/src/output/plugins/sles/Play.hxx
+++ b/src/output/plugins/sles/Play.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2012 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2012 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/system/ByteOrder.hxx b/src/system/ByteOrder.hxx
index 0a12de84c..d4cf454c9 100644
--- a/src/system/ByteOrder.hxx
+++ b/src/system/ByteOrder.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Max Kellermann <max@duempel.org>,
+ * Copyright (C) 2011-2015 Max Kellermann <max.kellermann@gmail.com>,
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/system/Error.hxx b/src/system/Error.hxx
index faacbe358..32887ec25 100644
--- a/src/system/Error.hxx
+++ b/src/system/Error.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/system/FileDescriptor.cxx b/src/system/FileDescriptor.cxx
index db258e107..68bb3c022 100644
--- a/src/system/FileDescriptor.cxx
+++ b/src/system/FileDescriptor.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/system/FileDescriptor.hxx b/src/system/FileDescriptor.hxx
index 5ce466ee1..89e2cab20 100644
--- a/src/system/FileDescriptor.hxx
+++ b/src/system/FileDescriptor.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/Cond.hxx b/src/thread/Cond.hxx
index ed016d212..3ca640ff1 100644
--- a/src/thread/Cond.hxx
+++ b/src/thread/Cond.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/CriticalSection.hxx b/src/thread/CriticalSection.hxx
index bb25f6c47..eb3f5c5fe 100644
--- a/src/thread/CriticalSection.hxx
+++ b/src/thread/CriticalSection.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2013 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/Mutex.hxx b/src/thread/Mutex.hxx
index 627c66103..f3064387c 100644
--- a/src/thread/Mutex.hxx
+++ b/src/thread/Mutex.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/PosixCond.hxx b/src/thread/PosixCond.hxx
index 208ba1ed5..7da71df38 100644
--- a/src/thread/PosixCond.hxx
+++ b/src/thread/PosixCond.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/PosixMutex.hxx b/src/thread/PosixMutex.hxx
index e0fd614c8..c3f2ac23f 100644
--- a/src/thread/PosixMutex.hxx
+++ b/src/thread/PosixMutex.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/Util.cxx b/src/thread/Util.cxx
index 25301f432..16fb1be7a 100644
--- a/src/thread/Util.cxx
+++ b/src/thread/Util.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2014-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/Util.hxx b/src/thread/Util.hxx
index 3344a9cb1..ed5b91bde 100644
--- a/src/thread/Util.hxx
+++ b/src/thread/Util.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2014-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/thread/WindowsCond.hxx b/src/thread/WindowsCond.hxx
index 04620dbaf..d01ee3a1d 100644
--- a/src/thread/WindowsCond.hxx
+++ b/src/thread/WindowsCond.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2013 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/ASCII.hxx b/src/util/ASCII.hxx
index d9a2198e1..38cd9b765 100644
--- a/src/util/ASCII.hxx
+++ b/src/util/ASCII.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/AllocatedArray.hxx b/src/util/AllocatedArray.hxx
index b682cbeb0..1a726a323 100644
--- a/src/util/AllocatedArray.hxx
+++ b/src/util/AllocatedArray.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/AllocatedString.cxx b/src/util/AllocatedString.cxx
index 635e1f001..7969eba00 100644
--- a/src/util/AllocatedString.cxx
+++ b/src/util/AllocatedString.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/AllocatedString.hxx b/src/util/AllocatedString.hxx
index 95872ff6f..43ba8f449 100644
--- a/src/util/AllocatedString.hxx
+++ b/src/util/AllocatedString.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/BindMethod.hxx b/src/util/BindMethod.hxx
index 968a593f3..451750121 100644
--- a/src/util/BindMethod.hxx
+++ b/src/util/BindMethod.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Cast.hxx b/src/util/Cast.hxx
index 647171970..da1324a68 100644
--- a/src/util/Cast.hxx
+++ b/src/util/Cast.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/CharUtil.hxx b/src/util/CharUtil.hxx
index efd40896a..23e338890 100644
--- a/src/util/CharUtil.hxx
+++ b/src/util/CharUtil.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/CircularBuffer.hxx b/src/util/CircularBuffer.hxx
index da6f412a5..17cb6541f 100644
--- a/src/util/CircularBuffer.hxx
+++ b/src/util/CircularBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Clamp.hxx b/src/util/Clamp.hxx
index 3217ef9f7..d6aa5f015 100644
--- a/src/util/Clamp.hxx
+++ b/src/util/Clamp.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2012 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/ConstBuffer.hxx b/src/util/ConstBuffer.hxx
index b98a8b543..67d7253d8 100644
--- a/src/util/ConstBuffer.hxx
+++ b/src/util/ConstBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/DeleteDisposer.hxx b/src/util/DeleteDisposer.hxx
index dd91e1299..15393a20a 100644
--- a/src/util/DeleteDisposer.hxx
+++ b/src/util/DeleteDisposer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Domain.hxx b/src/util/Domain.hxx
index 6dce7b731..a60abe34c 100644
--- a/src/util/Domain.hxx
+++ b/src/util/Domain.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/DynamicFifoBuffer.hxx b/src/util/DynamicFifoBuffer.hxx
index 5a9056edb..2979c57d6 100644
--- a/src/util/DynamicFifoBuffer.hxx
+++ b/src/util/DynamicFifoBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2003-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Exception.cxx b/src/util/Exception.cxx
index 06201cbc0..621590ebd 100644
--- a/src/util/Exception.cxx
+++ b/src/util/Exception.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Exception.hxx b/src/util/Exception.hxx
index 7e36c3d85..6cbda949d 100644
--- a/src/util/Exception.hxx
+++ b/src/util/Exception.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/ForeignFifoBuffer.hxx b/src/util/ForeignFifoBuffer.hxx
index b829fb030..369fcca22 100644
--- a/src/util/ForeignFifoBuffer.hxx
+++ b/src/util/ForeignFifoBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2003-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/HugeAllocator.cxx b/src/util/HugeAllocator.cxx
index f6910ea99..09a183831 100644
--- a/src/util/HugeAllocator.cxx
+++ b/src/util/HugeAllocator.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/HugeAllocator.hxx b/src/util/HugeAllocator.hxx
index 3c635147b..8bae3e46f 100644
--- a/src/util/HugeAllocator.hxx
+++ b/src/util/HugeAllocator.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/IterableSplitString.hxx b/src/util/IterableSplitString.hxx
index c89e3edb9..d939b6b44 100644
--- a/src/util/IterableSplitString.hxx
+++ b/src/util/IterableSplitString.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Macros.hxx b/src/util/Macros.hxx
index 6f6bd9f48..31be1cf76 100644
--- a/src/util/Macros.hxx
+++ b/src/util/Macros.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2013 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Manual.hxx b/src/util/Manual.hxx
index 9e9704178..a9543cc6f 100644
--- a/src/util/Manual.hxx
+++ b/src/util/Manual.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/NumberParser.hxx b/src/util/NumberParser.hxx
index b4efdeaae..47e9aacbd 100644
--- a/src/util/NumberParser.hxx
+++ b/src/util/NumberParser.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2013 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2013 Max Kellermann <max.kellermann@gmail.com>
* http://www.musicpd.org
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/util/ReusableArray.hxx b/src/util/ReusableArray.hxx
index e5541a88f..f309e8322 100644
--- a/src/util/ReusableArray.hxx
+++ b/src/util/ReusableArray.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/RuntimeError.hxx b/src/util/RuntimeError.hxx
index 4779c7c9a..8a3c86cb7 100644
--- a/src/util/RuntimeError.hxx
+++ b/src/util/RuntimeError.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/ScopeExit.hxx b/src/util/ScopeExit.hxx
index 0ec65cd9b..0c7414f18 100644
--- a/src/util/ScopeExit.hxx
+++ b/src/util/ScopeExit.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/SplitString.cxx b/src/util/SplitString.cxx
index a04aeb564..3404d026f 100644
--- a/src/util/SplitString.cxx
+++ b/src/util/SplitString.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/SplitString.hxx b/src/util/SplitString.hxx
index 53b6f628f..4152215d1 100644
--- a/src/util/SplitString.hxx
+++ b/src/util/SplitString.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2016 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2016 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StaticFifoBuffer.hxx b/src/util/StaticFifoBuffer.hxx
index 40668d152..2d51f22b3 100644
--- a/src/util/StaticFifoBuffer.hxx
+++ b/src/util/StaticFifoBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2003-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StringAPI.hxx b/src/util/StringAPI.hxx
index 08087f5f8..d9e89c628 100644
--- a/src/util/StringAPI.hxx
+++ b/src/util/StringAPI.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StringCompare.cxx b/src/util/StringCompare.cxx
index 5db53ef2f..0eb99034d 100644
--- a/src/util/StringCompare.cxx
+++ b/src/util/StringCompare.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StringCompare.hxx b/src/util/StringCompare.hxx
index 6d7b3474e..39df6c519 100644
--- a/src/util/StringCompare.hxx
+++ b/src/util/StringCompare.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StringPointer.hxx b/src/util/StringPointer.hxx
index ebb28f6f3..4555bfa7d 100644
--- a/src/util/StringPointer.hxx
+++ b/src/util/StringPointer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StringView.cxx b/src/util/StringView.cxx
index 904f92f65..b1abf9615 100644
--- a/src/util/StringView.cxx
+++ b/src/util/StringView.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/StringView.hxx b/src/util/StringView.hxx
index 99472764c..dce93d388 100644
--- a/src/util/StringView.hxx
+++ b/src/util/StringView.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/TextFile.hxx b/src/util/TextFile.hxx
index 3d7d2d0df..691b472a0 100644
--- a/src/util/TextFile.hxx
+++ b/src/util/TextFile.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/TimeParser.cxx b/src/util/TimeParser.cxx
index b42d93380..a644bf9cf 100644
--- a/src/util/TimeParser.cxx
+++ b/src/util/TimeParser.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2014-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/TimeParser.hxx b/src/util/TimeParser.hxx
index a956cadfc..8b539b4a7 100644
--- a/src/util/TimeParser.hxx
+++ b/src/util/TimeParser.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2014-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Tokenizer.cxx b/src/util/Tokenizer.cxx
index e065ab6e0..12f020259 100644
--- a/src/util/Tokenizer.cxx
+++ b/src/util/Tokenizer.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/Tokenizer.hxx b/src/util/Tokenizer.hxx
index 01e4db762..89c79d618 100644
--- a/src/util/Tokenizer.hxx
+++ b/src/util/Tokenizer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2009-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/UTF8.cxx b/src/util/UTF8.cxx
index 50ff19e88..e0d0a4fd7 100644
--- a/src/util/UTF8.cxx
+++ b/src/util/UTF8.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2014 Max Kellermann <max.kellermann@gmail.com>
* http://www.musicpd.org
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/util/UTF8.hxx b/src/util/UTF8.hxx
index 82d324f3e..e829407bb 100644
--- a/src/util/UTF8.hxx
+++ b/src/util/UTF8.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2011-2014 Max Kellermann <max.kellermann@gmail.com>
* http://www.musicpd.org
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/util/VarSize.hxx b/src/util/VarSize.hxx
index 4da115fba..a386e5dc4 100644
--- a/src/util/VarSize.hxx
+++ b/src/util/VarSize.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2008-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/WStringAPI.hxx b/src/util/WStringAPI.hxx
index c5aab37b6..1feaf78c6 100644
--- a/src/util/WStringAPI.hxx
+++ b/src/util/WStringAPI.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2010-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/WStringCompare.hxx b/src/util/WStringCompare.hxx
index bddd62120..ce5d3163d 100644
--- a/src/util/WStringCompare.hxx
+++ b/src/util/WStringCompare.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2015 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2015 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/src/util/WritableBuffer.hxx b/src/util/WritableBuffer.hxx
index 71706b140..d4b4ee894 100644
--- a/src/util/WritableBuffer.hxx
+++ b/src/util/WritableBuffer.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2014 Max Kellermann <max@duempel.org>
+ * Copyright (C) 2013-2014 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions