diff --git a/LICENSE b/LICENSE
index 2cdab7c..809d284 100644
--- a/LICENSE
+++ b/LICENSE
@@ -15,18 +15,27 @@ MIT/X Consortium License
 © 2013 Alexander Sedov <alex0player@gmail.com>
 © 2013 Nick White <git@njw.me.uk>
 © 2013 David Dufberg <david@dufberg.se>
-© 2014-2017 Quentin Rameau <quinq@fifth.space>
+© 2014-2021 Quentin Rameau <quinq@fifth.space>
 © 2014-2016 Markus Teich <markus.teich@stusta.mhn.de>
 © 2015 Jakukyo Friel <weakish@gmail.com>
 © 2015 Ben Woolley <tautolog@gmail.com>
 © 2015 Greg Reagle <greg.reagle@umbc.edu>
 © 2015 GhostAV <ghostav@riseup.net>
-© 2015 Ivan Tham <pickfire@riseup.net>
+© 2015-2017 Ivan Tham <pickfire@riseup.net>
 © 2015 Alexander Huemer <alexander.huemer@xx.vu>
 © 2015 Michael Stevens <mstevens@etla.org>
 © 2015 Felix Janda <felix.janda@posteo.de>
 © 2016 Charles Lehner <cel@celehner.com>
 © 2016 Dmitry Bogatov <KAction@gnu.org>
+© 2017 Hiltjo Posthuma <hiltjo@codemadness.org>
+© 2017 ssd <ssd@mailless.org>
+© 2017 Constantine Bytensky <kostya3@gmail.com>
+© 2017 Eon S. Jeon <esjeon@hyunmu.am>
+© 2017 Jochen Sprickerhof <git@jochen.sprickerhof.de>
+© 2018 nzl <uruabi@gmail.com>
+© 2018 Eddie Thieda <eddie.thieda@gmail.com>
+© 2018 Leonardo Taccari <iamleot@gmail.com>
+© 2019 efe <efe@efe.kim>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Makefile b/Makefile
index e5d4172..1edf820 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ dist: distclean
 	mkdir -p surf-$(VERSION)
 	cp -R LICENSE Makefile config.mk config.def.h README \
 	    surf-open.sh arg.h TODO.md surf.png \
-	    surf.1 $(SRC) $(CSRC) $(WSRC) surf-$(VERSION)
+	    surf.1 common.h $(SRC) $(WSRC) surf-$(VERSION)
 	tar -cf surf-$(VERSION).tar surf-$(VERSION)
 	gzip surf-$(VERSION).tar
 	rm -rf surf-$(VERSION)
diff --git a/README b/README
index 33b64d1..cafc385 100644
--- a/README
+++ b/README
@@ -54,4 +54,4 @@ surf-websearch-20190510-d068a38.diff
 
 Last implemented commit
 -----------------------
-2021-05-08 14:53	Bump version to 2.1	Quentin Rameau
+2021-05-20 22:16	Fix togglestats array	Quentin Rameau
diff --git a/surf.c b/surf.c
index fa4ae72..a8ce0cf 100644
--- a/surf.c
+++ b/surf.c
@@ -243,7 +243,7 @@ static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
 static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
 
 static char winid[64];
-static char togglestats[12];
+static char togglestats[11];
 static char pagestats[2];
 static Atom atoms[AtomLast];
 static Window embed;
@@ -685,11 +685,10 @@ gettogglestats(Client *c)
 	togglestats[3] = curconfig[DiskCache].val.i ?       'D' : 'd';
 	togglestats[4] = curconfig[LoadImages].val.i ?      'I' : 'i';
 	togglestats[5] = curconfig[JavaScript].val.i ?      'S' : 's';
-	togglestats[7] = curconfig[Style].val.i ?           'M' : 'm';
-	togglestats[8] = curconfig[FrameFlattening].val.i ? 'F' : 'f';
-	togglestats[9] = curconfig[Certificate].val.i ?     'X' : 'x';
-	togglestats[10] = curconfig[StrictTLS].val.i ?      'T' : 't';
-	togglestats[11] = '\0';
+	togglestats[6] = curconfig[Style].val.i ?           'M' : 'm';
+	togglestats[7] = curconfig[FrameFlattening].val.i ? 'F' : 'f';
+	togglestats[8] = curconfig[Certificate].val.i ?     'X' : 'x';
+	togglestats[9] = curconfig[StrictTLS].val.i ?       'T' : 't';
 }
 
 void