diff --git a/AUTHORS b/AUTHORS
index 5278e0a9..c43e34b8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 Current Maintainer(s):
- * Joachim Nilsson <troglobit@gmail.com>
+ * Joachim Wiberg <troglobit@gmail.com>
 
 Major Contributors:
  * Tobias Waldekranz <tobias@waldekranz.com>
diff --git a/LICENSE b/LICENSE
index 674b25ca..aa3370ec 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
-Copyright (c) 2008-2014  Joachim Nilsson <troglobit@gmail.com>
+Copyright (c) 2008-2020  Joachim Wiberg <troglobit@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index b2194e39..41f958ab 100644
--- a/README.md
+++ b/README.md
@@ -522,7 +522,7 @@ This project is based on the [original finit][] by [Claudio Matsuoka][]
 which was reverse engineered from syscalls of the [EeePC fastinit][] —
 "gaps filled with frog DNA …"
 
-Finit is developed and maintained by [Joachim Nilsson][] at [GitHub][].
+Finit is developed and maintained by [Joachim Wiberg][] at [GitHub][].
 Please file bug reports, clone it, or send pull requests for bug fixes
 and proposed extensions.
 
@@ -547,7 +547,7 @@ and proposed extensions.
 [original finit]:   http://helllabs.org/finit/
 [EeePC fastinit]:   https://web.archive.org/web/20071208212450/http://wiki.eeeuser.com/boot_process:the_boot_process
 [Claudio Matsuoka]: https://github.com/cmatsuoka
-[Joachim Nilsson]:  http://troglobit.com
+[Joachim Wiberg]:   http://troglobit.com
 [GitHub]:           https://github.com/troglobit/finit
 [License]:          https://en.wikipedia.org/wiki/MIT_License
 [License Badge]:    https://img.shields.io/badge/License-MIT-teal.svg