diff --git a/ChangeLog b/ChangeLog
index d4f1ee0..046eb41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.11 - UNRELEASED:
+ - Update my e-mail address.
 
 Changes in version 0.0.10 - 2019-04-12:
  - Disable behavior distinctive to crypto/tls when using utls.
diff --git a/LICENSE b/LICENSE
index 6b89f8c..34f1bd9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 3329538..621fe21 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ## obfs4 - The obfourscator
-#### Yawning Angel (yawning at torproject dot org)
+#### Yawning Angel (yawning at schwanenlied dot me)
 
 ### What?
 
diff --git a/common/csrand/csrand.go b/common/csrand/csrand.go
index 5dc617f..ddf14e8 100644
--- a/common/csrand/csrand.go
+++ b/common/csrand/csrand.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/drbg/hash_drbg.go b/common/drbg/hash_drbg.go
index 3d1a469..5a9cc7f 100644
--- a/common/drbg/hash_drbg.go
+++ b/common/drbg/hash_drbg.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/log/log.go b/common/log/log.go
index 53dd9c6..61d8d8c 100644
--- a/common/log/log.go
+++ b/common/log/log.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014-2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go
index 48508bf..15f7f38 100644
--- a/common/ntor/ntor.go
+++ b/common/ntor/ntor.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/ntor/ntor_test.go b/common/ntor/ntor_test.go
index c92c04e..e4d1543 100644
--- a/common/ntor/ntor_test.go
+++ b/common/ntor/ntor_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/probdist/weighted_dist.go b/common/probdist/weighted_dist.go
index 66c4f7b..d0d380c 100644
--- a/common/probdist/weighted_dist.go
+++ b/common/probdist/weighted_dist.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/probdist/weighted_dist_test.go b/common/probdist/weighted_dist_test.go
index 5bbcc32..4619212 100644
--- a/common/probdist/weighted_dist_test.go
+++ b/common/probdist/weighted_dist_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/replayfilter/replay_filter.go b/common/replayfilter/replay_filter.go
index f3b2bd0..00ee3e9 100644
--- a/common/replayfilter/replay_filter.go
+++ b/common/replayfilter/replay_filter.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/replayfilter/replay_filter_test.go b/common/replayfilter/replay_filter_test.go
index 884e4fb..b8ab094 100644
--- a/common/replayfilter/replay_filter_test.go
+++ b/common/replayfilter/replay_filter_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/args.go b/common/socks5/args.go
index d9ea099..a5efb43 100644
--- a/common/socks5/args.go
+++ b/common/socks5/args.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/rfc1929.go b/common/socks5/rfc1929.go
index d7849df..93a2c16 100644
--- a/common/socks5/rfc1929.go
+++ b/common/socks5/rfc1929.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/socks5.go b/common/socks5/socks5.go
index a6f785d..7630d3d 100644
--- a/common/socks5/socks5.go
+++ b/common/socks5/socks5.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/socks_test.go b/common/socks5/socks_test.go
index 3e331fb..ace7fd3 100644
--- a/common/socks5/socks_test.go
+++ b/common/socks5/socks_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/uniformdh/uniformdh.go b/common/uniformdh/uniformdh.go
index bcd25fc..1d500a3 100644
--- a/common/uniformdh/uniformdh.go
+++ b/common/uniformdh/uniformdh.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/uniformdh/uniformdh_test.go b/common/uniformdh/uniformdh_test.go
index d705d66..326293b 100644
--- a/common/uniformdh/uniformdh_test.go
+++ b/common/uniformdh/uniformdh_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index c899928..3efc41e 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014-2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go
index 181e79d..1adadf8 100644
--- a/obfs4proxy/proxy_http.go
+++ b/obfs4proxy/proxy_http.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/proxy_socks4.go b/obfs4proxy/proxy_socks4.go
index 536dd96..ac8be9e 100644
--- a/obfs4proxy/proxy_socks4.go
+++ b/obfs4proxy/proxy_socks4.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/pt_extras.go b/obfs4proxy/pt_extras.go
index dfe6d0f..18bc2df 100644
--- a/obfs4proxy/pt_extras.go
+++ b/obfs4proxy/pt_extras.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/termmon.go b/obfs4proxy/termmon.go
index d402716..59304c9 100644
--- a/obfs4proxy/termmon.go
+++ b/obfs4proxy/termmon.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/termmon_linux.go b/obfs4proxy/termmon_linux.go
index 9711cfc..926e630 100644
--- a/obfs4proxy/termmon_linux.go
+++ b/obfs4proxy/termmon_linux.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/base/base.go b/transports/base/base.go
index de51929..bc6e025 100644
--- a/transports/base/base.go
+++ b/transports/base/base.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/meeklite/base.go b/transports/meeklite/base.go
index a173996..399ff4c 100644
--- a/transports/meeklite/base.go
+++ b/transports/meeklite/base.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go
index fc97d7f..367563b 100644
--- a/transports/meeklite/meek.go
+++ b/transports/meeklite/meek.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go
index 7eaaa96..531bcd4 100644
--- a/transports/obfs2/obfs2.go
+++ b/transports/obfs2/obfs2.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go
index 26b4728..42bdd90 100644
--- a/transports/obfs3/obfs3.go
+++ b/transports/obfs3/obfs3.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
index f0c38c3..10604a9 100644
--- a/transports/obfs4/framing/framing.go
+++ b/transports/obfs4/framing/framing.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/framing/framing_test.go b/transports/obfs4/framing/framing_test.go
index f34a3a6..d830625 100644
--- a/transports/obfs4/framing/framing_test.go
+++ b/transports/obfs4/framing/framing_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/handshake_ntor.go b/transports/obfs4/handshake_ntor.go
index 6629c46..c5d0e6c 100644
--- a/transports/obfs4/handshake_ntor.go
+++ b/transports/obfs4/handshake_ntor.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/handshake_ntor_test.go b/transports/obfs4/handshake_ntor_test.go
index 8e4d260..701c610 100644
--- a/transports/obfs4/handshake_ntor_test.go
+++ b/transports/obfs4/handshake_ntor_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go
index 6a92f17..0182a2c 100644
--- a/transports/obfs4/obfs4.go
+++ b/transports/obfs4/obfs4.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/packet.go b/transports/obfs4/packet.go
index 653fae3..8d47af9 100644
--- a/transports/obfs4/packet.go
+++ b/transports/obfs4/packet.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go
index 8752f0d..cbf1d6e 100644
--- a/transports/obfs4/statefile.go
+++ b/transports/obfs4/statefile.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go
index 5817ee6..655ad7a 100644
--- a/transports/scramblesuit/base.go
+++ b/transports/scramblesuit/base.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/conn.go b/transports/scramblesuit/conn.go
index 715d20a..cc18e18 100644
--- a/transports/scramblesuit/conn.go
+++ b/transports/scramblesuit/conn.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/handshake_ticket.go b/transports/scramblesuit/handshake_ticket.go
index 9672e1b..f415be0 100644
--- a/transports/scramblesuit/handshake_ticket.go
+++ b/transports/scramblesuit/handshake_ticket.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/handshake_uniformdh.go b/transports/scramblesuit/handshake_uniformdh.go
index 5a79d64..107bc98 100644
--- a/transports/scramblesuit/handshake_uniformdh.go
+++ b/transports/scramblesuit/handshake_uniformdh.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/hkdf_expand.go b/transports/scramblesuit/hkdf_expand.go
index 5f4f4b4..cbdcbb3 100644
--- a/transports/scramblesuit/hkdf_expand.go
+++ b/transports/scramblesuit/hkdf_expand.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/transports.go b/transports/transports.go
index 921666a..2e83688 100644
--- a/transports/transports.go
+++ b/transports/transports.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without