diff --git a/AUTHORS b/AUTHORS
index ad7bdbd0ec..5be2ff647a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,109 +1,123 @@
-# Names should be added to this file like so:
-# Name or Organization <email address>
+# Names should be added to this file with this pattern:
+#
+# For individuals:
+#   Name <email address>
+#
+# For organizations:
+#   Organization <fnmatch pattern>
+#
+# See python fnmatch module documentation for more information.
+#
+# Please keep the list sorted.
 
+# BEGIN individuals section.
 Adam Fedor <adam.fedor@gmail.com>
 Akshay Shah <meetakshay99@gmail.com>
-Alex Henrie <alexhenrie24@gmail.com>
 Alexander Brauckmann <a.brauckmann@gmail.com>
 Alexandre Gouaillard <agouaillard@gmail.com>
+Alex Henrie <alexhenrie24@gmail.com>
 Andrew MacDonald <andrew@webrtc.org>
 Andrey Efremov <yoklmnprst@ya.ru>
 Anil Kumar <an1kumar@gmail.com>
 Ben Strong <bstrong@gmail.com>
 Bob Withers <bwit@pobox.com>
 Bridger Maxwell <bridgeyman@gmail.com>
-Chris Tserng <tserng@amazon.com>
 Christophe Dumez <ch.dumez@samsung.com>
+Chris Tserng <tserng@amazon.com>
 Cody Barnes <conceptgenesis@gmail.com>
 Colin Plumb
 Cyril Lashkevich <notorca@gmail.com>
+CZ Theng <cz.theng@gmail.com>
+Danail Kirov <dkirovbroadsoft@gmail.com>
 David Porter <david@porter.me>
 Dax Booysen <dax@younow.com>
-Danail Kirov <dkirovbroadsoft@gmail.com>
+Dennis Angelo <dennis.angelo@gmail.com>
 Dharmesh Chauhan <dharmesh.r.chauhan@gmail.com>
 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 Dmitry Lizin <sdkdimon@gmail.com>
+Eike Rathke <erathke@redhat.com>
 Eric Rescorla, RTFM Inc. <ekr@rtfm.com>
 Frederik Riedel, Frogg GmbH <frederik.riedel@frogg.io>
 Giji Gangadharan <giji.g@samsung.com>
 Graham Yoakum <gyoakum@skobalt.com>
 Gustavo Garcia <gustavogb@gmail.com>
+Hans Knoechel <hans@hans-knoechel.de>
 Hugues Ekra <hekra01@gmail.com>
 Jake Hilton <jakehilton@gmail.com>
 James H. Brown <jbrown@burgoyne.com>
+Jan Grulich <grulja@gmail.com>
 Jan Kalab <pitlicek@gmail.com>
 Jens Nielsen <jens.nielsen@berotec.se>
 Jiawei Ou <jiawei.ou@gmail.com>
 Jie Mao <maojie0924@gmail.com>
+Jiwon Kim <jwkim0000@gmail.com>
 Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
 Kiran Thind <kiran.thind@gmail.com>
+Korniltsev Anatoly <korniltsev.anatoly@gmail.com>
+Lennart Grahl <lennart.grahl@gmail.com>
 Luke Weber <luke.weber@gmail.com>
 Maksim Khobat <maksimkhobat@gmail.com>
 Mallikarjuna Rao V <vm.arjun@samsung.com>
 Manish Jethani <manish.jethani@gmail.com>
 Martin Storsjo <martin@martin.st>
 Matthias Liebig <matthias.gcode@gmail.com>
+Maxim Pavlov <pavllovmax@gmail.com>
 Maxim Potapov <vopatop.skam@gmail.com>
 Michael Iedema <michael@kapsulate.com>
+Michel Promonet <michel.promonet.1@gmail.com>
+Miguel Paris <mparisdiaz@gmail.com>
 Mike Gilbert <floppymaster@gmail.com>
+Min Wang <mingewang@gmail.com>
 Mo Zanaty <mzanaty@cisco.com>
 Pali Rohar
 Paul Kapustin <pkapustin@gmail.com>
-Philipp Hancke <philipp.hancke@googlemail.com>
 Peng Yu <yupeng323@gmail.com>
+Philipp Hancke <philipp.hancke@googlemail.com>
+Piasy Xu <xz4215@gmail.com>
 Rafael Lopez Diez <rafalopezdiez@gmail.com>
 Ralph Giles <giles@ghostscript.com>
+Raman Budny <budnyjj@gmail.com>
+Ramprakash Jelari <ennajelari@gmail.com>
 Riku Voipio <riku.voipio@linaro.org>
 Robert Bares <robert@bares.me>
 Robert Nagy <robert.nagy@gmail.com>
 Ryan Yoakum <ryoakum@skobalt.com>
-Satender Saroha <ssaroha@yahoo.com>
 Sarah Thompson <sarah@telergy.com>
+Satender Saroha <ssaroha@yahoo.com>
 Saul Kravitz <Saul.Kravitz@celera.com>
+Sergio Garcia Murillo <sergio.garcia.murillo@gmail.com>
 Silviu Caragea <silviu.cpp@gmail.com>
 Stefan Gula <steweg@gmail.com>
+Stephan Hartmann <stha09@googlemail.com>
 Steve Reid <sreid@sea-to-sky.net>
 Tarun Chawla <trnkumarchawla@gmail.com>
+Todd Wong <todd.wong.ndq@gmail.com>
+Tomas Popela <tomas.popela@gmail.com>
 Trevor Hayes <trevor.axiom@gmail.com>
 Uladzislau Susha <landby@gmail.com>
-Vladimir Beloborodov <VladimirTechMan@gmail.com>
 Vicken Simonian <vsimon@gmail.com>
 Victor Costan <costan@gmail.com>
+Vladimir Beloborodov <VladimirTechMan@gmail.com>
 Xiaohong Xu <freemine@yeah.net>
 Xiaolei Yu <dreifachstein@gmail.com>
 Yura Yaroshevich <yura.yaroshevich@gmail.com>
 Yuriy Pavlyshak <yuriy@appear.in>
-Hans Knoechel <hans@hans-knoechel.de>
-Korniltsev Anatoly <korniltsev.anatoly@gmail.com>
-Todd Wong <todd.wong.ndq@gmail.com>
-Sergio Garcia Murillo <sergio.garcia.murillo@gmail.com>
-Maxim Pavlov <pavllovmax@gmail.com>
 Yusuke Suzuki <utatane.tea@gmail.com>
-Piasy Xu <xz4215@gmail.com>
-Tomas Popela <tomas.popela@gmail.com>
-Jan Grulich <grulja@gmail.com>
-Jiwon Kim <jwkim0000@gmail.com>
-Eike Rathke <erathke@redhat.com>
-Michel Promonet <michel.promonet.1@gmail.com>
-Min Wang <mingewang@gmail.com>
-Ramprakash Jelari <ennajelari@gmail.com>
-CZ Theng <cz.theng@gmail.com>
-Miguel Paris <mparisdiaz@gmail.com>
-Raman Budny <budnyjj@gmail.com>
-Stephan Hartmann <stha09@googlemail.com>
-Lennart Grahl <lennart.grahl@gmail.com>
+# END individuals section.
 
-&yet LLC <*@andyet.com>
-8x8 Inc. <*@sip-communicator.org>
+# BEGIN organizations section.
 8x8 Inc. <*@8x8.com>
+8x8 Inc. <*@sip-communicator.org>
 Agora IO <*@agora.io>
 ARM Holdings <*@arm.com>
 BroadSoft Inc. <*@broadsoft.com>
+CoSMo Software Consulting, Pte Ltd <*@cosmosoftware.io>
 Facebook Inc. <*@fb.com>
 Google Inc. <*@google.com>
+Highfive, Inc. <*@highfive.com>
 HyperConnect Inc. <*@hpcnt.com>
-Life On Air Inc. <*@lifeonair.com>
 Intel Corporation <*@intel.com>
+Life On Air Inc. <*@lifeonair.com>
 Microsoft Corporation <*@microsoft.com>
 MIPS Technologies <*@mips.com>
 Mozilla Foundation <*@mozilla.com>
@@ -119,15 +133,14 @@ Telenor Digital AS <*@telenor.com>
 Temasys Communications <*@temasys.io>
 The Chromium Authors <*@chromium.org>
 The WebRTC Authors <*@webrtc.org>
+Threema GmbH <*@threema.ch>
+Tuple, LLC <*@tuple.app>
 Twilio, Inc. <*@twilio.com>
+Vewd Software AS <*@vewd.com>
+Videona Socialmedia <*@videona.com>
 Videxio AS <*@videxio.com>
 Vidyo, Inc. <*@vidyo.com>
 Vonage Holdings Corp. <*@vonage.com>
 Wire Swiss GmbH <*@wire.com>
-Vewd Software AS <*@vewd.com>
-Highfive, Inc. <*@highfive.com>
-CoSMo Software Consulting, Pte Ltd <*@cosmosoftware.io>
-Tuple, LLC <*@tuple.app>
-Videona Socialmedia <*@videona.com>
-Threema GmbH <*@threema.ch>
-Dennis Angelo <dennis.angelo@gmail.com>
+&yet LLC <*@andyet.com>
+# END organizations section.