diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..dec0e8932
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,13 @@
+maintainers:
+- Joel Martin (@kanaka)
+- Solly Ross (@directxman12)
+- Samuel Mannehed for Cendio AB (@samhed)
+- Pierre Ossman for Cendio AB (@CendioOssman)
+maintainersEmeritus:
+- @astrand 
+contributors:
+# There are a bunch of people that should be here.
+# If you want to be on this list, feel free send a PR
+# to add yourself.
+- jalf <git@jalf.dk>
+- NTT corp.
diff --git a/LICENSE.txt b/LICENSE.txt
index 8051cea4f..20f3eb025 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,5 @@
-noVNC is Copyright (C) 2011 Joel Martin <github@martintribe.org>
+noVNC is Copyright (C) 2018 The noVNC Authors
+(./AUTHORS)
 
 The noVNC core library files are licensed under the MPL 2.0 (Mozilla
 Public License 2.0). The noVNC core library is composed of the
diff --git a/README.md b/README.md
index df8c7970e..09bff7d24 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,9 @@ or deploying the noVNC application in production environments:
 
 ### Authors/Contributors
 
+See [AUTHORS](AUTHORS) for a (full-ish) list of authors.  If you're not on
+that list and you think you should be, feel free to send a PR to fix that.
+
 * Core team:
     * [Joel Martin](https://github.com/kanaka)
     * [Samuel Mannehed](https://github.com/samhed) (Cendio)
diff --git a/app/localization.js b/app/localization.js
index 90a98d480..100901c9d 100644
--- a/app/localization.js
+++ b/app/localization.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/app/styles/base.css b/app/styles/base.css
index 344db9b28..3ca9894dc 100644
--- a/app/styles/base.css
+++ b/app/styles/base.css
@@ -1,8 +1,6 @@
 /*
  * noVNC base CSS
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2016 Samuel Mannehed for Cendio AB
- * Copyright (C) 2016 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
  * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
  */
diff --git a/app/ui.js b/app/ui.js
index b40b6b9c3..c6d36e25c 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1,8 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2018 Samuel Mannehed for Cendio AB
- * Copyright (C) 2016 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/app/webutil.js b/app/webutil.js
index db76de60f..922ddc101 100644
--- a/app/webutil.js
+++ b/app/webutil.js
@@ -1,7 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 NTT corp.
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/display.js b/core/display.js
index 54c2c3601..59ddb340b 100644
--- a/core/display.js
+++ b/core/display.js
@@ -1,7 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2015 Samuel Mannehed for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/encodings.js b/core/encodings.js
index 5a70e6642..9fd38d58f 100644
--- a/core/encodings.js
+++ b/core/encodings.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/input/domkeytable.js b/core/input/domkeytable.js
index fdac48350..d2109f38d 100644
--- a/core/input/domkeytable.js
+++ b/core/input/domkeytable.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/input/fixedkeys.js b/core/input/fixedkeys.js
index daf088e38..4d09f2f7e 100644
--- a/core/input/fixedkeys.js
+++ b/core/input/fixedkeys.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/input/keyboard.js b/core/input/keyboard.js
index 55ce9171f..9dbc8d6e6 100644
--- a/core/input/keyboard.js
+++ b/core/input/keyboard.js
@@ -1,7 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/input/mouse.js b/core/input/mouse.js
index 38112fdf9..c78f2ab8b 100644
--- a/core/input/mouse.js
+++ b/core/input/mouse.js
@@ -1,7 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/input/vkeys.js b/core/input/vkeys.js
index 66bf32f0e..f84109b25 100644
--- a/core/input/vkeys.js
+++ b/core/input/vkeys.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/rfb.js b/core/rfb.js
index d1fcd2b7a..ffdd9c046 100644
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -1,8 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2018 Samuel Mannehed for Cendio AB
- * Copyright (C) 2018 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/util/browser.js b/core/util/browser.js
index 965ba3cf9..32e101e50 100644
--- a/core/util/browser.js
+++ b/core/util/browser.js
@@ -1,7 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2018 Samuel Mannehed for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/util/cursor.js b/core/util/cursor.js
index 95301b285..b032ab6c5 100644
--- a/core/util/cursor.js
+++ b/core/util/cursor.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright 2018 Pierre Ossman for noVNC
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/util/events.js b/core/util/events.js
index 4669aa478..f1222796a 100644
--- a/core/util/events.js
+++ b/core/util/events.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/util/eventtarget.js b/core/util/eventtarget.js
index 3e927f04b..c541645da 100644
--- a/core/util/eventtarget.js
+++ b/core/util/eventtarget.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright 2017 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/util/logging.js b/core/util/logging.js
index fb2d417d7..036a7dd2e 100644
--- a/core/util/logging.js
+++ b/core/util/logging.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/util/polyfill.js b/core/util/polyfill.js
index 3e9cbaa37..648ceebc3 100644
--- a/core/util/polyfill.js
+++ b/core/util/polyfill.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright 2017 Pierre Ossman for noVNC
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
  */
 
diff --git a/core/util/strings.js b/core/util/strings.js
index 1af6c463b..61f4f237d 100644
--- a/core/util/strings.js
+++ b/core/util/strings.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * See README.md for usage and integration instructions.
diff --git a/core/websock.js b/core/websock.js
index 9f09230ce..ab63a3a91 100644
--- a/core/websock.js
+++ b/core/websock.js
@@ -1,6 +1,6 @@
 /*
  * Websock: high-performance binary WebSockets
- * Copyright (C) 2012 Joel Martin
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  *
  * Websock is similar to the standard WebSocket object but with extra
diff --git a/po/de.po b/po/de.po
index ee690465e..0c3fa0d48 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translations for noVNC package
 # German translation for noVNC.
-# Copyright (C) 2016 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Loek Janssen <loekjanssen@gmail.com>, 2016.
 #
diff --git a/po/el.po b/po/el.po
index a98155455..5213ae542 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,5 +1,5 @@
 # Greek translations for noVNC package.
-# Copyright (C) 2016 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Giannis Kosmas <kosmasgiannis@gmail.com>, 2016.
 #
diff --git a/po/es.po b/po/es.po
index b98e81edc..e15655fbf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # Spanish translations for noVNC package
 # Traducciones al español para el paquete noVNC.
-# Copyright (C) 2018 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Juanjo Diaz <juanjo.diazmo@gmail.com>, 2018.
 #
diff --git a/po/nl.po b/po/nl.po
index bb77edc8a..410e62021 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # Dutch translations for noVNC package
 # Nederlandse vertalingen voor het pakket noVNC.
-# Copyright (C) 2016 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Loek Janssen <loekjanssen@gmail.com>, 2016.
 #
diff --git a/po/noVNC.pot b/po/noVNC.pot
index 8f231b231..9b4c55266 100644
--- a/po/noVNC.pot
+++ b/po/noVNC.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Various Authors
+# Copyright (C) YEAR The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
diff --git a/po/pl.po b/po/pl.po
index 768817231..5acfdc4f4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,5 +1,5 @@
 # Polish translations for noVNC package.
-# Copyright (C) 2017 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Mariusz Jamro <mariusz.jamro@gmail.com>, 2017.
 #
diff --git a/po/po2js b/po/po2js
index 65317162c..03c14900f 100755
--- a/po/po2js
+++ b/po/po2js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /*
  * ps2js: gettext .po to noVNC .js converter
- * Copyright (C) 2016 Pierre Ossman
+ * Copyright (C) 2018 The noVNC Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/po/sv.po b/po/sv.po
index ad4d61b3f..6111fddc3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 # Swedish translations for noVNC package
 # Svenska översättningar för paket noVNC.
-# Copyright (C) 2016 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Samuel Mannehed <samuel@cendio.se>, 2016.
 #
diff --git a/po/tr.po b/po/tr.po
index fdf3ba84e..8b5c18134 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,6 @@
 # Turkish translations for noVNC package
 # Turkish translation for noVNC.
-# Copyright (C) 2016 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Ömer ÇAKMAK <farukomercakmak@gmail.com>, 2018.
 #
diff --git a/po/xgettext-html b/po/xgettext-html
index 407477bc9..547f56876 100755
--- a/po/xgettext-html
+++ b/po/xgettext-html
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /*
  * xgettext-html: HTML gettext parser
- * Copyright (C) 2016 Pierre Ossman
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  */
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b5e8a5483..78bfb958d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Simplified Chinese translations for noVNC package.
-# Copyright (C) 2018 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Peter Dave Hello <hsu@peterdavehello.org>, 2018.
 #
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e01d59dad..9ddf550c1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,5 +1,5 @@
 # Traditional Chinese translations for noVNC package.
-# Copyright (C) 2018 Various Authors
+# Copyright (C) 2018 The noVNC Authors
 # This file is distributed under the same license as the noVNC package.
 # Peter Dave Hello <hsu@peterdavehello.org>, 2018.
 #
diff --git a/tests/playback.js b/tests/playback.js
index 5c2c29d09..acaef74d9 100644
--- a/tests/playback.js
+++ b/tests/playback.js
@@ -1,6 +1,6 @@
 /*
  * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  */
 
diff --git a/utils/genkeysymdef.js b/utils/genkeysymdef.js
index d29cc2cae..d21773f9f 100755
--- a/utils/genkeysymdef.js
+++ b/utils/genkeysymdef.js
@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 /*
  * genkeysymdef: X11 keysymdef.h to JavaScript converter
- * Copyright 2013 jalf <git@jalf.dk>
- * Copyright 2017 Pierre Ossman for Cendio AB
+ * Copyright (C) 2018 The noVNC Authors
  * Licensed under MPL 2.0 (see LICENSE.txt)
  */
 
diff --git a/utils/img2js.py b/utils/img2js.py
index 4d213420a..ceab6bf75 100755
--- a/utils/img2js.py
+++ b/utils/img2js.py
@@ -2,7 +2,7 @@
 
 #
 # Convert image to Javascript compatible base64 Data URI
-# Copyright 2011 Joel Martin
+# Copyright (C) 2018 The noVNC Authors
 # Licensed under MPL 2.0 (see docs/LICENSE.MPL-2.0)
 #
 
diff --git a/utils/json2graph.py b/utils/json2graph.py
index 8992382fd..bdaeeccaf 100755
--- a/utils/json2graph.py
+++ b/utils/json2graph.py
@@ -2,7 +2,7 @@
 
 '''
 Use matplotlib to generate performance charts
-Copyright 2011 Joel Martin
+Copyright (C) 2018 The noVNC Authors
 Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0)
 '''
 
diff --git a/utils/launch.sh b/utils/launch.sh
index ee2ca5eab..162607eb0 100755
--- a/utils/launch.sh
+++ b/utils/launch.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2016 Joel Martin
-# Copyright 2016 Solly Ross
+# Copyright (C) 2018 The noVNC Authors
 # Licensed under MPL 2.0 or any later version (see LICENSE.txt)
 
 usage() {
diff --git a/vnc.html b/vnc.html
index d00eec30d..dc608a26a 100644
--- a/vnc.html
+++ b/vnc.html
@@ -4,9 +4,7 @@
 
     <!--
     noVNC example: simple example using default UI
-    Copyright (C) 2012 Joel Martin
-    Copyright (C) 2016 Samuel Mannehed for Cendio AB
-    Copyright (C) 2016 Pierre Ossman for Cendio AB
+    Copyright (C) 2018 The noVNC Authors
     noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
     This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
 
diff --git a/vnc_lite.html b/vnc_lite.html
index dd1c4d884..9a38439c1 100644
--- a/vnc_lite.html
+++ b/vnc_lite.html
@@ -7,8 +7,7 @@
 
     This is a self-contained file which doesn't import WebUtil or external CSS.
 
-    Copyright (C) 2012 Joel Martin
-    Copyright (C) 2018 Samuel Mannehed for Cendio AB
+    Copyright (C) 2018 The noVNC Authors
     noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
     This file is licensed under the 2-Clause BSD license (see LICENSE.txt).