diff --git a/Changes b/Changes
index 872471de7..cd2f1edbc 100644
--- a/Changes
+++ b/Changes
@@ -22,7 +22,7 @@ The contributors that suggested a given feature are shown in []. Thanks!
 
 ****  Support $value$plusargs float and shorts, bug1592, bug1619. [Garrett Smith]
 
-****  Fix gate lvalue optimization error, bug831. [Jonathon Donaldson, Driss Halfdi]
+****  Fix gate lvalue optimization error, bug831. [Jonathon Donaldson, Driss Hafdi]
 
 ****  Fix color assertion on empty if, bug1604. [Andrew Holme]
 
diff --git a/bin/verilator b/bin/verilator
index 9a9b4f104..17a9bef07 100755
--- a/bin/verilator
+++ b/bin/verilator
@@ -4938,63 +4938,75 @@ Inc., picoChip Designs Ltd., Sun Microsystems Inc., Nauticus Networks Inc.,
 and SiCortex Inc.
 
 The people who have contributed major functionality are Byron Bradley,
-Jeremy Bennett, Jie Xu, Lane Brooks, John Coiner, Duane Galbi, Paul Wasson,
-and Wilson Snyder.  Major testers included Jeff Dutton, Jonathon Donaldson,
-Ralf Karge, David Hewson, Iztok Jeras, Wim Michiels, Alex Solomatnikov,
-Sebastien Van Cauwenberghe, Gene Weber, and Clifford Wolf.
+Jeremy Bennett, Lane Brooks, John Coiner, Duane Galbi, Todd Strader, Paul
+Wasson, Jie Xu, and Wilson Snyder.  Major testers included Jeff Dutton,
+Jonathon Donaldson, Ralf Karge, David Hewson, Iztok Jeras, Wim Michiels,
+Alex Solomatnikov, Sebastien Van Cauwenberghe, Gene Weber, and Clifford
+Wolf.
 
 Some of the people who have provided ideas and feedback for Verilator
-include: Ahmed El-Mahmoudy, David Addison, Tariq B. Ahmad, Nikana
-Anastasiadis, Hans Van Antwerpen, Vasu Arasanipalai, Jens Arm, Sharad
-Bagri, Andrew Bardsley, Matthew Barr, Geoff Barrett, Julius Baxter, Jeremy
-Bennett, Michael Berman, Victor Besyakov, David Binderman, Johan Bjork,
-David Black, Tymoteusz Blazejczyk, Daniel Bone, Gregg Bouchard, Christopher
-Boumenot, Nick Bowler, Byron Bradley, Bryan Brady, Charlie Brej, J Briquet,
-Lane Brooks, John Brownlee, Jeff Bush, Lawrence Butcher, Ted Campbell,
-Chris Candler, Lauren Carlson, Donal Casey, Sebastien Van Cauwenberghe,
-Terry Chen, Enzo Chi, Robert A. Clark, Allan Cochrane, John Coiner, Laurens
-van Dam, Gunter Dannoritzer, Ashutosh Das, Bernard Deadman, John Demme,
-Mike Denio, John Deroo, Philip Derrick, Joe DErrico, John Dickol, Ruben
-Diez, Danny Ding, Ivan Djordjevic, Jonathon Donaldson, Sebastian Dressler,
-Alex Duller, Jeff Dutton, Usuario Eda, Chandan Egbert, Joe Eiler, Ahmed
+include: David Addison, Tariq B. Ahmad, Nikana Anastasiadis, Hans Van
+Antwerpen, Vasu Arasanipalai, Jens Arm, Sharad Bagri, Matthew Ballance,
+Andrew Bardsley, Matthew Barr, Geoff Barrett, Julius Baxter, Jeremy
+Bennett, Michael Berman, Victor Besyakov, David Binderman, Piotr Binkowski,
+Johan Bjork, David Black, Tymoteusz Blazejczyk, Daniel Bone, Gregg
+Bouchard, Christopher Boumenot, Nick Bowler, Byron Bradley, Bryan Brady,
+Maarten De Braekeleer, Charlie Brej, J Briquet, Lane Brooks, John Brownlee,
+Jeff Bush, Lawrence Butcher, Tony Bybell, Ted Campbell, Chris Candler,
+Lauren Carlson, Donal Casey, Sebastien Van Cauwenberghe, Alex Chadwick,
+Terry Chen, Yi-Chung Chen, Enzo Chi, Robert A. Clark, Allan Cochrane, John
+Coiner, Gianfranco Costamagna, George Cuan, Joe DErrico, Lukasz Dalek,
+Laurens van Dam, Gunter Dannoritzer, Ashutosh Das, Bernard Deadman, John
+Demme, Mike Denio, John Deroo, Philip Derrick, John Dickol, Ruben Diez,
+Danny Ding, Jacko Dirks, Ivan Djordjevic, Jonathon Donaldson, Leendert van
+Doorn, Sebastian Dressler, Alex Duller, Jeff Dutton, Tomas Dzetkulic,
+Usuario Eda, Charles Eddleston, Chandan Egbert, Joe Eiler, Ahmed
 El-Mahmoudy, Trevor Elbourne, Robert Farrell, Eugen Fekete, Fabrizio
-Ferrandi, Brian Flachs, Andrea Foletto, Bob Fredieu, Duane Galbi, Christian
-Gelinek, Glen Gibb, Shankar Giri, Dan Gisselquist, Sam Gladstone, Amir
-Gonnen, Chitlesh Goorah, Xuan Guo, Neil Hamilton, Jannis Harder, Junji
-Hashimoto, Thomas Hawkins, Robert Henry, David Hewson, Jamey Hicks, Joel
-Holdsworth, Hiroki Honda, Alex Hornung, David Horton, Jae Hossell, Alan
-Hunter, James Hutchinson, Jamie Iles, Ben Jackson, Shareef Jalloq,
-Krzysztof Jankowski, HyungKi Jeong, Iztok Jeras, James Johnson, Christophe
-Joly, Franck Jullien, James Jung, Mike Kagen, Arthur Kahlich, Kaalia Kahn,
-Guy-Armand Kamendje, Vasu Kandadi, Patricio Kaplan, Ralf Karge, Dan Katz,
-Sol Katzman, Jonathan Kimmitt, Olof Kindgren, Dan Kirkham, Sobhan Klnv,
-Gernot Koch, Soon Koh, Steve Kolecki, Brett Koonce, Wojciech Koszek, Varun
-Koyyalagunta, David Kravitz, Roland Kruse, Sergey Kvachonok, Ed Lander,
-Steve Lang, Stephane Laurent, Walter Lavino, Christian Leber, Igor Lesik,
-John Li, Eivind Liland, Yu Sheng Lin, Charlie Lind, Andrew Ling, Paul Liu,
-Derek Lockhart, Arthur Low, Stefan Ludwig, Dan Lussier, Fred Ma, Duraid
-Madina, Julien Margetts, Mark Marshall, Alfonso Martinez, Yves Mathieu,
-Patrick Maupin, Jason McMullan, Elliot Mednick, Wim Michiels, Miodrag
-Milanovic, Wai Sum Mong, Sean Moore, Dennis Muhlestein, John Murphy,
-Richard Myers, Dimitris Nalbantis, Bob Newgard, Cong Van Nguyen, Paul
-Nitza, Pete Nixon, Lisa Noack, Mark Nodine, Andreas Olofsson, James
-Pallister, Brad Parker, Maciej Piechotka, David Pierce, Dominic Plunkett,
-David Poole, Mike Popoloski, Rich Porter, Niranjan Prabhu, Usha
-Priyadharshini, Mark Jackson Pulver, Prateek Puri, Marshal Qiao, Chris
-Randall, Anton Rapp, Josh Redford, Odd Magne Reitan, Frederic Requin,
-Alberto Del Rio, Oleg Rodionov, Paul Rolfe, Arjen Roodselaar, Jan Egil
-Ruud, John Sanguinetti, Galen Seitz, Salman Sheikh, Mike Shinkarovsky,
-Rafael Shirakawa, Jeffrey Short, Rodney Sinclair, Steven Slatter, Brian
-Small, Wilson Snyder, Alex Solomatnikov, Wei Song, Art Stamness, John
-Stevenson, Patrick Stewart, Rob Stoddard, Todd Strader, John Stroebel, Sven
-Stucki, Emerson Suguimoto, Gene Sullivan, Renga Sundararajan, Yutetsu
-Takatsukasa, Peter Tengstrand, Wesley Terpstra, Rui Terra, Stefan Thiede,
-Gary Thomas, Kevin Thompson, Ian Thompson, Mike Thyer, Hans Tichelaar,
-Steve Tong, Michael Tresidder, Holger Waechtler, Stefan Wallentowitz, Shawn
-Wang, Paul Wasson, Greg Waters, Thomas Watts, Eugene Weber, David Welch,
-Thomas J Whatson, Leon Wildman, Gerald Williams, Trevor Williams, Jeff
-Winston, Joshua Wise, Clifford Wolf, Johan Wouters, Junyi Xi, Ding
-Xiaoliang, Jie Xu, Mandy Xu, Luke Yang, and Amir Yazdanbakhsh.
+Ferrandi, Udi Finkelstein, Brian Flachs, Andrea Foletto, Bob Fredieu, Duane
+Galbi, Benjamin Gartner, Christian Gelinek, Peter Gerst, Glen Gibb, Shankar
+Giri, Dan Gisselquist, Sam Gladstone, Amir Gonnen, Chitlesh Goorah, Sergi
+Granell, Al Grant, Xuan Guo, Driss Hafdi, Neil Hamilton, Oyvind Harboe,
+Jannis Harder, Junji Hashimoto, Thomas Hawkins, Mitch Hayenga, Robert
+Henry, David Hewson, Jamey Hicks, Joel Holdsworth, Andrew Holme, Hiroki
+Honda, Alex Hornung, David Horton, Jae Hossell, Alan Hunter, James
+Hutchinson, Jamie Iles, Ben Jackson, Shareef Jalloq, Krzysztof Jankowski,
+HyungKi Jeong, Iztok Jeras, James Johnson, Christophe Joly, Franck Jullien,
+James Jung, Mike Kagen, Arthur Kahlich, Kaalia Kahn, Guy-Armand Kamendje,
+Vasu Kandadi, Kanad Kanhere, Patricio Kaplan, Pieter Kapsenberg, Ralf
+Karge, Dan Katz, Sol Katzman, Jonathan Kimmitt, Olof Kindgren, Kevin
+Kiningham, Dan Kirkham, Sobhan Klnv, Gernot Koch, Soon Koh, Steve Kolecki,
+Brett Koonce, Will Korteland, Wojciech Koszek, Varun Koyyalagunta, David
+Kravitz, Roland Kruse, Sergey Kvachonok, Ed Lander, Steve Lang, Stephane
+Laurent, Walter Lavino, Christian Leber, Larry Lee, Igor Lesik, John Li,
+Eivind Liland, Yu Sheng Lin, Charlie Lind, Andrew Ling, Paul Liu, Derek
+Lockhart, Jake Longo, Arthur Low, Stefan Ludwig, Dan Lussier, Fred Ma,
+Duraid Madina, Affe Mao, Julien Margetts, Mark Marshall, Alfonso Martinez,
+Yves Mathieu, Patrick Maupin, Jason McMullan, Elliot Mednick, Wim Michiels,
+Miodrag Milanovic, Wai Sum Mong, Peter Monsson, Sean Moore, Dennis
+Muhlestein, John Murphy, Matt Myers, Richard Myers, Dimitris Nalbantis,
+Peter Nelson, Bob Newgard, Cong Van Nguyen, Paul Nitza, Yossi Nivin, Pete
+Nixon, Lisa Noack, Mark Nodine, Andreas Olofsson, Aleksander Osman, James
+Pallister, Brad Parker, Dan Petrisko, Maciej Piechotka, David Pierce,
+Dominic Plunkett, David Poole, Mike Popoloski, Roman Popov, Rich Porter,
+Niranjan Prabhu, Usha Priyadharshini, Mark Jackson Pulver, Prateek Puri,
+Marshal Qiao, Danilo Ramos, Chris Randall, Anton Rapp, Josh Redford, Odd
+Magne Reitan, Frederic Requin, Frederick Requin, Alberto Del Rio, Eric
+Rippey, Oleg Rodionov, Paul Rolfe, Arjen Roodselaar, Tobias Rosenkranz, Jan
+Egil Ruud, Denis Rystsov, John Sanguinetti, Galen Seitz, Salman Sheikh, Hao
+Shi, Mike Shinkarovsky, Rafael Shirakawa, Jeffrey Short, Anderson Ignacio
+Da Silva, Rodney Sinclair, Steven Slatter, Brian Small, Garrett Smith,
+Wilson Snyder, Stan Sokorac, Alex Solomatnikov, Wei Song, Art Stamness,
+John Stevenson, Patrick Stewart, Rob Stoddard, Todd Strader, John Stroebel,
+Sven Stucki, Howard Su, Emerson Suguimoto, Gene Sullivan, Renga
+Sundararajan, Rupert Swarbrick, Yutetsu Takatsukasa, Peter Tengstrand,
+Wesley Terpstra, Rui Terra, Stefan Thiede, Gary Thomas, Ian Thompson, Kevin
+Thompson, Mike Thyer, Hans Tichelaar, Viktor Tomov, Steve Tong, Michael
+Tresidder, Neil Turton, Bogdan Vukobratovic, Holger Waechtler, Philipp
+Wagner, Stefan Wallentowitz, Shawn Wang, Paul Wasson, Greg Waters, Thomas
+Watts, Eugene Weber, David Welch, Thomas J Whatson, Leon Wildman, Gerald
+Williams, Trevor Williams, Jeff Winston, Joshua Wise, Clifford Wolf, Johan
+Wouters, Junyi Xi, Ding Xiaoliang, Jie Xu, Mandy Xu, Luke Yang, and Amir
+Yazdanbakhsh.
 
 Thanks to them, and all those we've missed including above, or wished to
 remain anonymous.
diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS
index 90765fd69..025749b7f 100644
--- a/docs/CONTRIBUTORS
+++ b/docs/CONTRIBUTORS
@@ -2,7 +2,8 @@ The contributors listed below have certified their Verilator contributions
 under the Developer Certificate of Origin
 (https://developercertificate.org/).
 
-Please see the Verilator manual for additional contributors.
+Please see the Verilator manual for 200+ additional contributors. Thanks to
+all.
 
 Ahmed El-Mahmoudy
 Alex Chadwick