about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xafl-cmin4
-rwxr-xr-xafl-plot4
-rwxr-xr-xafl-whatsup4
-rw-r--r--dictionaries/gif.dict2
-rw-r--r--dictionaries/html_tags.dict2
-rw-r--r--dictionaries/jpeg.dict2
-rw-r--r--dictionaries/js.dict2
-rw-r--r--dictionaries/png.dict2
-rw-r--r--dictionaries/sql.dict2
-rw-r--r--dictionaries/tiff.dict2
-rw-r--r--dictionaries/webp.dict2
-rw-r--r--dictionaries/xml.dict2
-rw-r--r--docs/power_schedules.txt2
-rw-r--r--experimental/argv_fuzzing/argv-fuzz-inl.h2
-rwxr-xr-xexperimental/asan_cgroups/limit_memory.sh2
-rw-r--r--experimental/canvas_harness/canvas_harness.html2
-rwxr-xr-xexperimental/clang_asm_normalize/as2
-rwxr-xr-xexperimental/crash_triage/triage_crashes.sh4
-rwxr-xr-xexperimental/distributed_fuzzing/sync_script.sh2
-rw-r--r--experimental/persistent_demo/persistent_demo.c2
-rw-r--r--experimental/post_library/post_library.so.c2
-rw-r--r--experimental/post_library/post_library_png.so.c2
-rw-r--r--gcc_plugin/Makefile2
-rw-r--r--gcc_plugin/afl-gcc-fast.c2
-rw-r--r--gcc_plugin/afl-gcc-rt.o.c2
-rw-r--r--include/afl-as.h2
-rw-r--r--include/afl-fuzz.h2
-rw-r--r--include/alloc-inl.h2
-rw-r--r--include/android-ashmem.h2
-rw-r--r--include/common.h2
-rw-r--r--include/config.h2
-rw-r--r--include/debug.h2
-rw-r--r--include/forkserver.h2
-rw-r--r--include/hash.h2
-rw-r--r--include/sharedmem.h2
-rw-r--r--include/types.h2
-rw-r--r--libdislocator/Makefile2
-rw-r--r--libdislocator/libdislocator.so.c2
-rw-r--r--libtokencap/Makefile2
-rw-r--r--libtokencap/libtokencap.so.c2
-rw-r--r--llvm_mode/Makefile2
-rw-r--r--llvm_mode/afl-clang-fast.c2
-rw-r--r--llvm_mode/afl-llvm-pass.so.cc2
-rw-r--r--llvm_mode/afl-llvm-rt.o.c2
-rwxr-xr-xqemu_mode/build_qemu_support.sh2
-rw-r--r--qemu_mode/patches/afl-qemu-common.h2
-rw-r--r--qemu_mode/patches/afl-qemu-cpu-inl.h2
-rw-r--r--qemu_mode/patches/afl-qemu-cpu-translate-inl.h2
-rw-r--r--qemu_mode/patches/afl-qemu-tcg-inl.h2
-rw-r--r--qemu_mode/patches/afl-qemu-translate-inl.h2
-rw-r--r--src/afl-analyze.c4
-rw-r--r--src/afl-as.c4
-rw-r--r--src/afl-common.c2
-rw-r--r--src/afl-forkserver.c2
-rw-r--r--src/afl-fuzz-bitmap.c2
-rw-r--r--src/afl-fuzz-extras.c2
-rw-r--r--src/afl-fuzz-globals.c2
-rw-r--r--src/afl-fuzz-init.c2
-rw-r--r--src/afl-fuzz-misc.c2
-rw-r--r--src/afl-fuzz-one.c2
-rw-r--r--src/afl-fuzz-python.c2
-rw-r--r--src/afl-fuzz-queue.c2
-rw-r--r--src/afl-fuzz-run.c2
-rw-r--r--src/afl-fuzz-stats.c2
-rw-r--r--src/afl-fuzz.c4
-rw-r--r--src/afl-gcc.c6
-rw-r--r--src/afl-gotcpu.c8
-rw-r--r--src/afl-sharedmem.c2
-rw-r--r--src/afl-showmap.c4
-rw-r--r--src/afl-tmin.c4
-rw-r--r--test-instr.c2
-rwxr-xr-xunicorn_mode/build_unicorn_support.sh2
-rw-r--r--unicorn_mode/patches/afl-unicorn-common.h2
-rw-r--r--unicorn_mode/patches/afl-unicorn-cpu-inl.h2
-rw-r--r--unicorn_mode/patches/afl-unicorn-cpu-translate-inl.h2
-rw-r--r--unicorn_mode/patches/afl-unicorn-tcg-op-inl.h2
-rw-r--r--unicorn_mode/patches/afl-unicorn-tcg-runtime-inl.h2
78 files changed, 92 insertions, 92 deletions
diff --git a/Makefile b/Makefile
index ce0d6781..cfcd0890 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # american fuzzy lop - makefile
 # -----------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 # 
 # Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
 # 
diff --git a/afl-cmin b/afl-cmin
index 88635550..e4e0fd85 100755
--- a/afl-cmin
+++ b/afl-cmin
@@ -3,7 +3,7 @@
 # american fuzzy lop - corpus minimization tool
 # ---------------------------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 #
 # Copyright 2014, 2015 Google Inc. All rights reserved.
 #
@@ -36,7 +36,7 @@
 # array sizes.
 #
 
-echo "corpus minimization tool for afl-fuzz by <lcamtuf@google.com>"
+echo "corpus minimization tool for afl-fuzz by Michal Zalewski"
 echo
 
 #########
diff --git a/afl-plot b/afl-plot
index bc86fb85..b6108a09 100755
--- a/afl-plot
+++ b/afl-plot
@@ -3,7 +3,7 @@
 # american fuzzy lop - Advanced Persistent Graphing
 # -------------------------------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 # Based on a design & prototype by Michael Rash.
 #
 # Copyright 2014, 2015 Google Inc. All rights reserved.
@@ -15,7 +15,7 @@
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
 
-echo "progress plotting utility for afl-fuzz by <lcamtuf@google.com>"
+echo "progress plotting utility for afl-fuzz by Michal Zalewski"
 echo
 
 if [ ! "$#" = "2" ]; then
diff --git a/afl-whatsup b/afl-whatsup
index 505f7eba..2666d208 100755
--- a/afl-whatsup
+++ b/afl-whatsup
@@ -3,7 +3,7 @@
 # american fuzzy lop - status check tool
 # --------------------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 #
 # Copyright 2015 Google Inc. All rights reserved.
 #
@@ -17,7 +17,7 @@
 # instances of afl-fuzz.
 #
 
-echo "status check tool for afl-fuzz by <lcamtuf@google.com>"
+echo "status check tool for afl-fuzz by Michal Zalewski"
 echo
 test "$1" = "-h" && {
   echo $0
diff --git a/dictionaries/gif.dict b/dictionaries/gif.dict
index 71148937..441b3b8d 100644
--- a/dictionaries/gif.dict
+++ b/dictionaries/gif.dict
@@ -2,7 +2,7 @@
 # AFL dictionary for GIF images
 # -----------------------------
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 header_87a="87a"
diff --git a/dictionaries/html_tags.dict b/dictionaries/html_tags.dict
index ba946df3..2805de90 100644
--- a/dictionaries/html_tags.dict
+++ b/dictionaries/html_tags.dict
@@ -5,7 +5,7 @@
 # A basic collection of HTML tags likely to matter to HTML parsers. Does *not*
 # include any attributes or attribute values.
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 tag_a="<a>"
diff --git a/dictionaries/jpeg.dict b/dictionaries/jpeg.dict
index 15efede7..40282f1a 100644
--- a/dictionaries/jpeg.dict
+++ b/dictionaries/jpeg.dict
@@ -2,7 +2,7 @@
 # AFL dictionary for JPEG images
 # ------------------------------
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 header_jfif="JFIF\x00"
diff --git a/dictionaries/js.dict b/dictionaries/js.dict
index 9db37bfe..7926364c 100644
--- a/dictionaries/js.dict
+++ b/dictionaries/js.dict
@@ -4,7 +4,7 @@
 #
 # Contains basic reserved keywords and syntax building blocks.
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 keyword_arguments="arguments"
diff --git a/dictionaries/png.dict b/dictionaries/png.dict
index ea12d19e..ad9ea328 100644
--- a/dictionaries/png.dict
+++ b/dictionaries/png.dict
@@ -5,7 +5,7 @@
 # Just the basic, standard-originating sections; does not include vendor
 # extensions.
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 header_png="\x89PNG\x0d\x0a\x1a\x0a"
diff --git a/dictionaries/sql.dict b/dictionaries/sql.dict
index 58342473..efa44ba8 100644
--- a/dictionaries/sql.dict
+++ b/dictionaries/sql.dict
@@ -11,7 +11,7 @@
 # standpoint, because they are usually not allowed in non-privileged
 # contexts).
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 function_abs=" abs(1)"
diff --git a/dictionaries/tiff.dict b/dictionaries/tiff.dict
index 8f04b5af..720e56ce 100644
--- a/dictionaries/tiff.dict
+++ b/dictionaries/tiff.dict
@@ -5,7 +5,7 @@
 # Just the basic, standard-originating sections; does not include vendor
 # extensions.
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 header_ii="II*\x00"
diff --git a/dictionaries/webp.dict b/dictionaries/webp.dict
index 8a70e73b..53aa28c7 100644
--- a/dictionaries/webp.dict
+++ b/dictionaries/webp.dict
@@ -2,7 +2,7 @@
 # AFL dictionary for WebP images
 # ------------------------------
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 header_RIFF="RIFF"
diff --git a/dictionaries/xml.dict b/dictionaries/xml.dict
index 8127aa28..d8375452 100644
--- a/dictionaries/xml.dict
+++ b/dictionaries/xml.dict
@@ -4,7 +4,7 @@
 #
 # Several basic syntax elements and attributes, modeled on libxml2.
 #
-# Created by Michal Zalewski <lcamtuf@google.com>
+# Created by Michal Zalewski
 #
 
 attr_encoding=" encoding=\"1\""
diff --git a/docs/power_schedules.txt b/docs/power_schedules.txt
index f5f66bd6..7b9d34c4 100644
--- a/docs/power_schedules.txt
+++ b/docs/power_schedules.txt
@@ -2,7 +2,7 @@ afl++'s power schedules based on AFLfast
 
 <a href="https://comp.nus.edu.sg/~mboehme/paper/CCS16.pdf"><img src="https://comp.nus.edu.sg/~mboehme/paper/CCS16.png" align="right" width="250"></a>
 Power schedules implemented by Marcel Böhme \<marcel.boehme@acm.org\>. 
-AFLFast is an extension of AFL which was written by Michal Zalewski \<lcamtuf@google.com\>.
+AFLFast is an extension of AFL which was written by Michal Zalewski.
 
 AFLfast has helped in the success of Team Codejitsu at the finals of the DARPA Cyber Grand Challenge where their bot Galactica took **2nd place** in terms of #POVs proven (see red bar at https://www.cybergrandchallenge.com/event#results). AFLFast exposed several previously unreported CVEs that could not be exposed by AFL in 24 hours and otherwise exposed vulnerabilities significantly faster than AFL while generating orders of magnitude more unique crashes. 
 
diff --git a/experimental/argv_fuzzing/argv-fuzz-inl.h b/experimental/argv_fuzzing/argv-fuzz-inl.h
index b042d38c..5d411046 100644
--- a/experimental/argv_fuzzing/argv-fuzz-inl.h
+++ b/experimental/argv_fuzzing/argv-fuzz-inl.h
@@ -2,7 +2,7 @@
    american fuzzy lop - sample argv fuzzing wrapper
    ------------------------------------------------
 
-   Written by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2015 Google Inc. All rights reserved.
 
diff --git a/experimental/asan_cgroups/limit_memory.sh b/experimental/asan_cgroups/limit_memory.sh
index b0c77d15..97950410 100755
--- a/experimental/asan_cgroups/limit_memory.sh
+++ b/experimental/asan_cgroups/limit_memory.sh
@@ -7,7 +7,7 @@
 #            David A. Wheeler <dwheeler@ida.org>
 #
 # Edits to bring the script in line with afl-cmin and other companion scripts
-# by Michal Zalewski <lcamtuf@google.com>. All bugs are my fault.
+# by Michal Zalewski. All bugs are my fault.
 #
 # Copyright 2015 Institute for Defense Analyses.
 #
diff --git a/experimental/canvas_harness/canvas_harness.html b/experimental/canvas_harness/canvas_harness.html
index 19293667..7b31d8b4 100644
--- a/experimental/canvas_harness/canvas_harness.html
+++ b/experimental/canvas_harness/canvas_harness.html
@@ -4,7 +4,7 @@
   american fuzzy lop - <canvas> harness
   -------------------------------------
  
-  Written and maintained by Michal Zalewski <lcamtuf@google.com>
+  Written by Michal Zalewski
  
   Copyright 2013, 2014 Google Inc. All rights reserved.
  
diff --git a/experimental/clang_asm_normalize/as b/experimental/clang_asm_normalize/as
index 4ee07e69..bd83c4ff 100755
--- a/experimental/clang_asm_normalize/as
+++ b/experimental/clang_asm_normalize/as
@@ -3,7 +3,7 @@
 # american fuzzy lop - clang assembly normalizer
 # ----------------------------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 # The idea for this wrapper comes from Ryan Govostes.
 #
 # Copyright 2013, 2014 Google Inc. All rights reserved.
diff --git a/experimental/crash_triage/triage_crashes.sh b/experimental/crash_triage/triage_crashes.sh
index 5894a4d6..205bc143 100755
--- a/experimental/crash_triage/triage_crashes.sh
+++ b/experimental/crash_triage/triage_crashes.sh
@@ -3,7 +3,7 @@
 # american fuzzy lop - crash triage utility
 # -----------------------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 #
 # Copyright 2013, 2014, 2017 Google Inc. All rights reserved.
 #
@@ -22,7 +22,7 @@
 # necessary.
 #
 
-echo "crash triage utility for afl-fuzz by <lcamtuf@google.com>"
+echo "crash triage utility for afl-fuzz by Michal Zalewski"
 echo
 
 ulimit -v 100000 2>/dev/null
diff --git a/experimental/distributed_fuzzing/sync_script.sh b/experimental/distributed_fuzzing/sync_script.sh
index 2d5e0635..31b0e436 100755
--- a/experimental/distributed_fuzzing/sync_script.sh
+++ b/experimental/distributed_fuzzing/sync_script.sh
@@ -3,7 +3,7 @@
 # american fuzzy lop - fuzzer synchronization tool
 # ------------------------------------------------
 #
-# Written and maintained by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 #
 # Copyright 2014 Google Inc. All rights reserved.
 #
diff --git a/experimental/persistent_demo/persistent_demo.c b/experimental/persistent_demo/persistent_demo.c
index d091febe..a94c8374 100644
--- a/experimental/persistent_demo/persistent_demo.c
+++ b/experimental/persistent_demo/persistent_demo.c
@@ -2,7 +2,7 @@
    american fuzzy lop - persistent mode example
    --------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2015 Google Inc. All rights reserved.
 
diff --git a/experimental/post_library/post_library.so.c b/experimental/post_library/post_library.so.c
index 72620ff0..048eea70 100644
--- a/experimental/post_library/post_library.so.c
+++ b/experimental/post_library/post_library.so.c
@@ -2,7 +2,7 @@
    american fuzzy lop - postprocessor library example
    --------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2015 Google Inc. All rights reserved.
 
diff --git a/experimental/post_library/post_library_png.so.c b/experimental/post_library/post_library_png.so.c
index 080a6938..6ba95c1a 100644
--- a/experimental/post_library/post_library_png.so.c
+++ b/experimental/post_library/post_library_png.so.c
@@ -2,7 +2,7 @@
    american fuzzy lop - postprocessor for PNG
    ------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2015 Google Inc. All rights reserved.
 
diff --git a/gcc_plugin/Makefile b/gcc_plugin/Makefile
index d10eba49..a603df78 100644
--- a/gcc_plugin/Makefile
+++ b/gcc_plugin/Makefile
@@ -4,7 +4,7 @@
 #
 # Written by Austin Seipp <aseipp@pobox.com> and
 #            Laszlo Szekeres <lszekeres@google.com> and
-#            Michal Zalewski <lcamtuf@google.com> and
+#            Michal Zalewski and
 #            Heiko Eißfeldt  <heiko@hexco.de>
 #
 # GCC integration design is based on the LLVM design, which comes
diff --git a/gcc_plugin/afl-gcc-fast.c b/gcc_plugin/afl-gcc-fast.c
index 73709321..b0461584 100644
--- a/gcc_plugin/afl-gcc-fast.c
+++ b/gcc_plugin/afl-gcc-fast.c
@@ -4,7 +4,7 @@
 
    Written by Austin Seipp <aseipp@pobox.com> and
               Laszlo Szekeres <lszekeres@google.com> and
-              Michal Zalewski <lcamtuf@google.com>
+              Michal Zalewski
 
    GCC integration design is based on the LLVM design, which comes
    from Laszlo Szekeres.
diff --git a/gcc_plugin/afl-gcc-rt.o.c b/gcc_plugin/afl-gcc-rt.o.c
index f6754bd4..dd79a0ec 100644
--- a/gcc_plugin/afl-gcc-rt.o.c
+++ b/gcc_plugin/afl-gcc-rt.o.c
@@ -4,7 +4,7 @@
 
    Written by Austin Seipp <aseipp@pobox.com> and
               Laszlo Szekeres <lszekeres@google.com> and
-              Michal Zalewski <lcamtuf@google.com>
+              Michal Zalewski
 
    GCC integration design is based on the LLVM design, which comes
    from Laszlo Szekeres.
diff --git a/include/afl-as.h b/include/afl-as.h
index 048866db..f0263312 100644
--- a/include/afl-as.h
+++ b/include/afl-as.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - injectable parts
    ---------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 7e9ced46..1e6140dd 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - fuzzer header
    ------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/alloc-inl.h b/include/alloc-inl.h
index b0815ab1..f5bb7246 100644
--- a/include/alloc-inl.h
+++ b/include/alloc-inl.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - error-checking, memory-zeroing alloc routines
    --------------------------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/android-ashmem.h b/include/android-ashmem.h
index 6c7a98db..f4d31739 100644
--- a/include/android-ashmem.h
+++ b/include/android-ashmem.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - android shared memory compatibility layer
    ----------------------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/common.h b/include/common.h
index e13bf0a0..7c3d4517 100644
--- a/include/common.h
+++ b/include/common.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - common routines header
    ---------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/config.h b/include/config.h
index 396224fb..2e993a42 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - vaguely configurable bits
    ------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/debug.h b/include/debug.h
index cccfc284..ed6c29e9 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - debug / error handling macros
    ----------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/include/forkserver.h b/include/forkserver.h
index 9a099888..9cabe58e 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - forkserver header
    ----------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
diff --git a/include/hash.h b/include/hash.h
index 7085df32..1a8ac252 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -12,7 +12,7 @@
 
    Austin's original code is public domain.
 
-   Other code written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Other code written by Michal Zalewski
 
    Copyright 2016 Google Inc. All rights reserved.
 
diff --git a/include/sharedmem.h b/include/sharedmem.h
index 18e4ee9f..cec6c025 100644
--- a/include/sharedmem.h
+++ b/include/sharedmem.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - shared memory related header
    ---------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
diff --git a/include/types.h b/include/types.h
index 07fc7e91..c34bf522 100644
--- a/include/types.h
+++ b/include/types.h
@@ -2,7 +2,7 @@
    american fuzzy lop++ - type definitions and minor macros
    --------------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/libdislocator/Makefile b/libdislocator/Makefile
index cbaa05ea..91efba07 100644
--- a/libdislocator/Makefile
+++ b/libdislocator/Makefile
@@ -2,7 +2,7 @@
 # american fuzzy lop - libdislocator
 # ----------------------------------
 #
-# Written by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 #
 # Copyright 2016 Google Inc. All rights reserved.
 #
diff --git a/libdislocator/libdislocator.so.c b/libdislocator/libdislocator.so.c
index 8834a1fc..57607210 100644
--- a/libdislocator/libdislocator.so.c
+++ b/libdislocator/libdislocator.so.c
@@ -3,7 +3,7 @@
    american fuzzy lop - dislocator, an abusive allocator
    -----------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2016 Google Inc. All rights reserved.
 
diff --git a/libtokencap/Makefile b/libtokencap/Makefile
index 3fd01b2c..91933140 100644
--- a/libtokencap/Makefile
+++ b/libtokencap/Makefile
@@ -2,7 +2,7 @@
 # american fuzzy lop - libtokencap
 # --------------------------------
 #
-# Written by Michal Zalewski <lcamtuf@google.com>
+# Written by Michal Zalewski
 #
 # Copyright 2016 Google Inc. All rights reserved.
 #
diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c
index 17b6190c..39095beb 100644
--- a/libtokencap/libtokencap.so.c
+++ b/libtokencap/libtokencap.so.c
@@ -3,7 +3,7 @@
    american fuzzy lop - extract tokens passed to strcmp / memcmp
    -------------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2016 Google Inc. All rights reserved.
 
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index 0360bfbe..7cfbe92d 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -3,7 +3,7 @@
 # -----------------------------------------
 #
 # Written by Laszlo Szekeres <lszekeres@google.com> and
-#            Michal Zalewski <lcamtuf@google.com>
+#            Michal Zalewski
 #
 # LLVM integration design comes from Laszlo Szekeres.
 #
diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c
index 54f9e6e9..a7f6acdc 100644
--- a/llvm_mode/afl-clang-fast.c
+++ b/llvm_mode/afl-clang-fast.c
@@ -3,7 +3,7 @@
    ------------------------------------------------
 
    Written by Laszlo Szekeres <lszekeres@google.com> and
-              Michal Zalewski <lcamtuf@google.com>
+              Michal Zalewski
 
    LLVM integration design comes from Laszlo Szekeres.
 
diff --git a/llvm_mode/afl-llvm-pass.so.cc b/llvm_mode/afl-llvm-pass.so.cc
index 3ca5ccc4..475a3f33 100644
--- a/llvm_mode/afl-llvm-pass.so.cc
+++ b/llvm_mode/afl-llvm-pass.so.cc
@@ -3,7 +3,7 @@
    ---------------------------------------------------
 
    Written by Laszlo Szekeres <lszekeres@google.com> and
-              Michal Zalewski <lcamtuf@google.com>
+              Michal Zalewski
 
    LLVM integration design comes from Laszlo Szekeres. C bits copied-and-pasted
    from afl-as.c are Michal's fault.
diff --git a/llvm_mode/afl-llvm-rt.o.c b/llvm_mode/afl-llvm-rt.o.c
index 20b34336..5740fe42 100644
--- a/llvm_mode/afl-llvm-rt.o.c
+++ b/llvm_mode/afl-llvm-rt.o.c
@@ -3,7 +3,7 @@
    ---------------------------------------------------
 
    Written by Laszlo Szekeres <lszekeres@google.com> and
-              Michal Zalewski <lcamtuf@google.com>
+              Michal Zalewski
 
    LLVM integration design comes from Laszlo Szekeres.
 
diff --git a/qemu_mode/build_qemu_support.sh b/qemu_mode/build_qemu_support.sh
index 55d72e0d..f18cbdf3 100755
--- a/qemu_mode/build_qemu_support.sh
+++ b/qemu_mode/build_qemu_support.sh
@@ -4,7 +4,7 @@
 # --------------------------------------
 #
 # Originally written by Andrew Griffiths <agriffiths@google.com> and
-#                       Michal Zalewski <lcamtuf@google.com>
+#                       Michal Zalewski
 #
 # TCG instrumentation and block chaining support by Andrea Biondo
 #                                    <andrea.biondo965@gmail.com>
diff --git a/qemu_mode/patches/afl-qemu-common.h b/qemu_mode/patches/afl-qemu-common.h
index c86b5b45..1da3359d 100644
--- a/qemu_mode/patches/afl-qemu-common.h
+++ b/qemu_mode/patches/afl-qemu-common.h
@@ -3,7 +3,7 @@
    -------------------------------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    TCG instrumentation and block chaining support by Andrea Biondo
                                       <andrea.biondo965@gmail.com>
diff --git a/qemu_mode/patches/afl-qemu-cpu-inl.h b/qemu_mode/patches/afl-qemu-cpu-inl.h
index 262a7dab..7358fc3b 100644
--- a/qemu_mode/patches/afl-qemu-cpu-inl.h
+++ b/qemu_mode/patches/afl-qemu-cpu-inl.h
@@ -3,7 +3,7 @@
    -------------------------------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    TCG instrumentation and block chaining support by Andrea Biondo
                                       <andrea.biondo965@gmail.com>
diff --git a/qemu_mode/patches/afl-qemu-cpu-translate-inl.h b/qemu_mode/patches/afl-qemu-cpu-translate-inl.h
index b6d3da1f..62858724 100644
--- a/qemu_mode/patches/afl-qemu-cpu-translate-inl.h
+++ b/qemu_mode/patches/afl-qemu-cpu-translate-inl.h
@@ -3,7 +3,7 @@
    -------------------------------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    TCG instrumentation and block chaining support by Andrea Biondo
                                       <andrea.biondo965@gmail.com>
diff --git a/qemu_mode/patches/afl-qemu-tcg-inl.h b/qemu_mode/patches/afl-qemu-tcg-inl.h
index d7a25695..e3de09d8 100644
--- a/qemu_mode/patches/afl-qemu-tcg-inl.h
+++ b/qemu_mode/patches/afl-qemu-tcg-inl.h
@@ -3,7 +3,7 @@
    -------------------------------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    TCG instrumentation and block chaining support by Andrea Biondo
                                       <andrea.biondo965@gmail.com>
diff --git a/qemu_mode/patches/afl-qemu-translate-inl.h b/qemu_mode/patches/afl-qemu-translate-inl.h
index 5f61d7c9..881dbc8d 100644
--- a/qemu_mode/patches/afl-qemu-translate-inl.h
+++ b/qemu_mode/patches/afl-qemu-translate-inl.h
@@ -3,7 +3,7 @@
    -------------------------------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    TCG instrumentation and block chaining support by Andrea Biondo
                                       <andrea.biondo965@gmail.com>
diff --git a/src/afl-analyze.c b/src/afl-analyze.c
index 2d13621b..5555a262 100644
--- a/src/afl-analyze.c
+++ b/src/afl-analyze.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - file format analyzer
    -------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
@@ -841,7 +841,7 @@ int main(int argc, char** argv) {
 
   doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH;
 
-  SAYF(cCYA "afl-analyze" VERSION cRST " by <lcamtuf@google.com>\n");
+  SAYF(cCYA "afl-analyze" VERSION cRST " by Michal Zalewski\n");
 
   while ((opt = getopt(argc, argv, "+i:f:m:t:eQUWh")) > 0)
 
diff --git a/src/afl-as.c b/src/afl-as.c
index b5a5ed58..2b023432 100644
--- a/src/afl-as.c
+++ b/src/afl-as.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - wrapper for GNU as
    -----------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
@@ -501,7 +501,7 @@ int main(int argc, char** argv) {
 
   if (isatty(2) && !getenv("AFL_QUIET")) {
 
-    SAYF(cCYA "afl-as" VERSION cRST " by <lcamtuf@google.com>\n");
+    SAYF(cCYA "afl-as" VERSION cRST " by Michal Zalewski\n");
 
   } else
 
diff --git a/src/afl-common.c b/src/afl-common.c
index e753e797..ec010c2d 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - common routines
    --------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index d9f67da5..b11ee5ce 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - forkserver code
    --------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
diff --git a/src/afl-fuzz-bitmap.c b/src/afl-fuzz-bitmap.c
index d001dbee..22876626 100644
--- a/src/afl-fuzz-bitmap.c
+++ b/src/afl-fuzz-bitmap.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - bitmap related routines
    ----------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-extras.c b/src/afl-fuzz-extras.c
index 1a0e2eff..23b2c235 100644
--- a/src/afl-fuzz-extras.c
+++ b/src/afl-fuzz-extras.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - extras relates routines
    ----------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-globals.c b/src/afl-fuzz-globals.c
index 8340394a..36ba6e14 100644
--- a/src/afl-fuzz-globals.c
+++ b/src/afl-fuzz-globals.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - globals declarations
    -------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c
index a37ce8ba..a77904b5 100644
--- a/src/afl-fuzz-init.c
+++ b/src/afl-fuzz-init.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - initialization related routines
    ------------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-misc.c b/src/afl-fuzz-misc.c
index a7372b7d..f45642f4 100644
--- a/src/afl-fuzz-misc.c
+++ b/src/afl-fuzz-misc.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - misc stuffs from Mordor
    ----------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index 31d58a10..bed8d254 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - fuzze_one routines in different flavours
    ---------------------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-python.c b/src/afl-fuzz-python.c
index 1a28f603..1a8b7f9d 100644
--- a/src/afl-fuzz-python.c
+++ b/src/afl-fuzz-python.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - python extension routines
    ------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-queue.c b/src/afl-fuzz-queue.c
index 905fd931..9f036186 100644
--- a/src/afl-fuzz-queue.c
+++ b/src/afl-fuzz-queue.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - queue relates routines
    ---------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c
index 5211921f..e12b06eb 100644
--- a/src/afl-fuzz-run.c
+++ b/src/afl-fuzz-run.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - target execution related routines
    --------------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz-stats.c b/src/afl-fuzz-stats.c
index 7e8639f2..2ea03e94 100644
--- a/src/afl-fuzz-stats.c
+++ b/src/afl-fuzz-stats.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - stats related routines
    ---------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index 44037ce8..bb342112 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -2,7 +2,7 @@
    american fuzzy lop - fuzzer code
    --------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
@@ -127,7 +127,7 @@ int main(int argc, char** argv) {
 
   SAYF(cCYA
        "afl-fuzz" VERSION cRST
-       " based on afl by <lcamtuf@google.com> and a big online community\n");
+       " based on afl by Michal Zalewski and a big online community\n");
 
   doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH;
 
diff --git a/src/afl-gcc.c b/src/afl-gcc.c
index dd7ba4d6..740442dc 100644
--- a/src/afl-gcc.c
+++ b/src/afl-gcc.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - wrapper for GCC and clang
    ------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
@@ -335,7 +335,7 @@ int main(int argc, char** argv) {
 
   if (argc == 2 && strcmp(argv[1], "-h") == 0) {
 
-    printf("afl-cc" VERSION " by <lcamtuf@google.com>\n\n");
+    printf("afl-cc" VERSION " by Michal Zalewski\n\n");
     printf("%s \n\n", argv[0]);
     printf("afl-gcc has no command line options\n");
     printf(
@@ -347,7 +347,7 @@ int main(int argc, char** argv) {
 
   if (isatty(2) && !getenv("AFL_QUIET")) {
 
-    SAYF(cCYA "afl-cc" VERSION cRST " by <lcamtuf@google.com>\n");
+    SAYF(cCYA "afl-cc" VERSION cRST " by Michal Zalewski\n");
     SAYF(cYEL "[!] " cBRI "NOTE: " cRST
               "afl-gcc is deprecated, llvm_mode is much faster and has more "
               "options\n");
diff --git a/src/afl-gotcpu.c b/src/afl-gotcpu.c
index dc938b65..850943dd 100644
--- a/src/afl-gotcpu.c
+++ b/src/afl-gotcpu.c
@@ -2,7 +2,7 @@
    american fuzzy lop - free CPU gizmo
    -----------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
@@ -142,7 +142,7 @@ int main(int argc, char** argv) {
 
   if (argc > 1) {
 
-    printf("afl-gotcpu" VERSION " by <lcamtuf@google.com>\n");
+    printf("afl-gotcpu" VERSION " by Michal Zalewski\n");
     printf("\n%s \n\n", argv[0]);
     printf("afl-gotcpu does not have command line options\n");
     printf("afl-gotcpu prints out which CPUs are available\n");
@@ -154,7 +154,7 @@ int main(int argc, char** argv) {
 
   u32 cpu_cnt = sysconf(_SC_NPROCESSORS_ONLN), idle_cpus = 0, maybe_cpus = 0, i;
 
-  SAYF(cCYA "afl-gotcpu" VERSION cRST " by <lcamtuf@google.com>\n");
+  SAYF(cCYA "afl-gotcpu" VERSION cRST " by Michal Zalewski\n");
 
   ACTF("Measuring per-core preemption rate (this will take %0.02f sec)...",
        ((double)CTEST_CORE_TRG_MS) / 1000);
@@ -275,7 +275,7 @@ int main(int argc, char** argv) {
 
   u32 util_perc;
 
-  SAYF(cCYA "afl-gotcpu" VERSION cRST " by <lcamtuf@google.com>\n");
+  SAYF(cCYA "afl-gotcpu" VERSION cRST " by Michal Zalewski\n");
 
   /* Run a busy loop for CTEST_TARGET_MS. */
 
diff --git a/src/afl-sharedmem.c b/src/afl-sharedmem.c
index 0bd1ff2f..d94100a3 100644
--- a/src/afl-sharedmem.c
+++ b/src/afl-sharedmem.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - shared memory related code
    -------------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
diff --git a/src/afl-showmap.c b/src/afl-showmap.c
index 31f12856..b54ac2b0 100644
--- a/src/afl-showmap.c
+++ b/src/afl-showmap.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - map display utility
    ------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
@@ -395,7 +395,7 @@ static void setup_signal_handlers(void) {
 
 static void show_banner(void) {
 
-  SAYF(cCYA "afl-showmap" VERSION cRST " by <lcamtuf@google.com>\n");
+  SAYF(cCYA "afl-showmap" VERSION cRST " by Michal Zalewski\n");
 
 }
 
diff --git a/src/afl-tmin.c b/src/afl-tmin.c
index 7f354727..a72e1dda 100644
--- a/src/afl-tmin.c
+++ b/src/afl-tmin.c
@@ -2,7 +2,7 @@
    american fuzzy lop++ - test case minimizer
    ------------------------------------------
 
-   Originally written by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski
 
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
 
@@ -1032,7 +1032,7 @@ int main(int argc, char** argv) {
 
   doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH;
 
-  SAYF(cCYA "afl-tmin" VERSION cRST " by <lcamtuf@google.com>\n");
+  SAYF(cCYA "afl-tmin" VERSION cRST " by Michal Zalewski\n");
 
   while ((opt = getopt(argc, argv, "+i:o:f:m:t:B:xeQUWh")) > 0)
 
diff --git a/test-instr.c b/test-instr.c
index 2450dbf4..161bdb8e 100644
--- a/test-instr.c
+++ b/test-instr.c
@@ -2,7 +2,7 @@
    american fuzzy lop - a trivial program to test the build
    --------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Written by Michal Zalewski
 
    Copyright 2014 Google Inc. All rights reserved.
 
diff --git a/unicorn_mode/build_unicorn_support.sh b/unicorn_mode/build_unicorn_support.sh
index 1575f66c..3bd404b8 100755
--- a/unicorn_mode/build_unicorn_support.sh
+++ b/unicorn_mode/build_unicorn_support.sh
@@ -6,7 +6,7 @@
 # Originally written by Nathan Voss <njvoss99@gmail.com>
 # 
 # Adapted from code by Andrew Griffiths <agriffiths@google.com> and
-#                      Michal Zalewski <lcamtuf@google.com>
+#                      Michal Zalewski
 #
 # Adapted for AFLplusplus by Dominik Maier <mail@dmnk.co>
 #
diff --git a/unicorn_mode/patches/afl-unicorn-common.h b/unicorn_mode/patches/afl-unicorn-common.h
index fd88e21b..66d03803 100644
--- a/unicorn_mode/patches/afl-unicorn-common.h
+++ b/unicorn_mode/patches/afl-unicorn-common.h
@@ -3,7 +3,7 @@
    ----------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    Adapted for afl-unicorn by Dominik Maier <mail@dmnk.co>
 
diff --git a/unicorn_mode/patches/afl-unicorn-cpu-inl.h b/unicorn_mode/patches/afl-unicorn-cpu-inl.h
index 082d6d68..72092e29 100644
--- a/unicorn_mode/patches/afl-unicorn-cpu-inl.h
+++ b/unicorn_mode/patches/afl-unicorn-cpu-inl.h
@@ -3,7 +3,7 @@
    ----------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    Adapted for afl-unicorn by Dominik Maier <mail@dmnk.co>
 
diff --git a/unicorn_mode/patches/afl-unicorn-cpu-translate-inl.h b/unicorn_mode/patches/afl-unicorn-cpu-translate-inl.h
index 7c84058f..70472a72 100644
--- a/unicorn_mode/patches/afl-unicorn-cpu-translate-inl.h
+++ b/unicorn_mode/patches/afl-unicorn-cpu-translate-inl.h
@@ -3,7 +3,7 @@
    ----------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    Adapted for afl-unicorn by Dominik Maier <mail@dmnk.co>
 
diff --git a/unicorn_mode/patches/afl-unicorn-tcg-op-inl.h b/unicorn_mode/patches/afl-unicorn-tcg-op-inl.h
index d21bbcc7..8f4a8748 100644
--- a/unicorn_mode/patches/afl-unicorn-tcg-op-inl.h
+++ b/unicorn_mode/patches/afl-unicorn-tcg-op-inl.h
@@ -3,7 +3,7 @@
    ----------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    Adapted for afl-unicorn by Dominik Maier <mail@dmnk.co>
 
diff --git a/unicorn_mode/patches/afl-unicorn-tcg-runtime-inl.h b/unicorn_mode/patches/afl-unicorn-tcg-runtime-inl.h
index 3031d3a6..53ab654c 100644
--- a/unicorn_mode/patches/afl-unicorn-tcg-runtime-inl.h
+++ b/unicorn_mode/patches/afl-unicorn-tcg-runtime-inl.h
@@ -3,7 +3,7 @@
    ----------------------------------------------
 
    Originally written by Andrew Griffiths <agriffiths@google.com> and
-                         Michal Zalewski <lcamtuf@google.com>
+                         Michal Zalewski
 
    Adapted for afl-unicorn by Dominik Maier <mail@dmnk.co>