diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0547578..532a203 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,7 +4,7 @@
  Command line options:         207
  curl_easy_setopt() options:   245
  Public functions in libcurl:  61
- Contributors:                 1548
+ Contributors:                 1571
 
 This release includes the following changes:
 
@@ -12,6 +12,7 @@
 
 This release includes the following bugfixes:
 
+ o CVE-2017-9502: file: URL buffer overflow [65]
  o openssl: fix memory leak in servercert
  o tests: remove the html and PDF versions from the tarball
  o mbedtls: enable NTLM (& SMB) even if MD4 support is unavailable
@@ -114,6 +115,18 @@
  o libtest: fix implicit-fallthrough warnings with GCC 7
  o BINDINGS: add Ring binding [58]
  o curl_ntlm_core: pass unsigned char to toupper
+ o test1262: verify ftp download with -z for "if older than this"
+ o test1521: test all curl_easy_setopt options [59]
+ o typecheck-gcc: allow CURLOPT_STDERR to be NULL too
+ o metalink: remove unused printf() argument
+ o file: make speedcheck use current time for checks [60]
+ o configure: fix link with librtmp when specifying path [61]
+ o examples/multi-uv.c: fix deprecated symbol [62]
+ o cmake: Fix inconsistency regarding mbed TLS include directory [63]
+ o setopt: check CURLOPT_ADDRESS_SCOPE option range
+ o gitignore: ignore all vim swap files [64]
+ o urlglob: fix division by zero
+ o libressl: OCSP and intermediate certs workaround no longer needed [66]
 
 This release includes the following known bugs:
 
@@ -123,14 +136,16 @@
 advice from friends like these:
 
   Akhil Kedia, Alan Jenkins, Anatol Belski, Bernhard M. Wiedemann,
-  Brian Childs, canavan at github, Dan Fandrich, Daniel Stenberg,
-  Edward Thomson, Gisle Vanem, Helmut K. C. Tessarek, Joel Depooter,
-  jonrumsey at github, Kai Engert, Kamil Dudka, Kevin Ji, Lloyd Fournier,
-  Mahmoud Samir Fayed, Marcel Raad, Martin Kepplinger, Max Dymond,
-  Michael Kaufmann, Nick Zitzmann, Phil Crump, Piotr Dobrogost, Ray Satiro,
-  Richard Hsu, Ron Eldor, Sergei Nikulov, Simon Warta, stootill at github,
-  Thomas Klausner, Travis Burtrum, Vincas Razma, wyattoday at github,
-  (35 contributors)
+  Brian Childs, canavan at github, Chris Carlmar, Dan Fandrich,
+  Daniel Stenberg, Edward Thomson, Gisle Vanem, GwanYeong Kim,
+  Helmut K. C. Tessarek, Joel Depooter, jonrumsey at github, Kai Engert,
+  Kamil Dudka, Kevin Ji, Lloyd Fournier, Mahmoud Samir Fayed, Marcel Raad,
+  Martin Kepplinger, Max Dymond, Michael Kaufmann, Nick Zitzmann, Paul Harris,
+  Phil Crump, Piotr Dobrogost, Ray Satiro, Richard Hsu, Ron Eldor,
+  Ryuichi KAWAMATA, Sergei Nikulov, Simon Warta, stootill at github,
+  Stuart Henderson, TheAssassin at github, Thomas Klausner, Travis Burtrum,
+  Vincas Razma, wyattoday at github,
+  (41 contributors)
 
         Thanks! (and sorry if I forgot to mention someone)
 
@@ -194,3 +209,11 @@
  [56] = https://curl.haxx.se/bug/?i=1532
  [57] = https://curl.haxx.se/bug/?i=1536
  [58] = https://curl.haxx.se/bug/?i=1539
+ [59] = https://curl.haxx.se/bug/?i=1543
+ [60] = https://curl.haxx.se/bug/?i=1550
+ [61] = https://curl.haxx.se/mail/lib-2017-06/0017.html
+ [62] = https://curl.haxx.se/bug/?i=1557
+ [63] = https://curl.haxx.se/bug/?i=1541
+ [64] = https://curl.haxx.se/bug/?i=1561
+ [65] = https://curl.haxx.se/docs/adv_20170614.html
+ [66] = https://curl.haxx.se/mail/lib-2017-06/0038.html
diff --git a/docs/THANKS b/docs/THANKS
index 62f208c..9d8d124 100644
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -19,10 +19,12 @@
 Adrian Schuur
 Adriano Meirelles
 Ajit Dhumale
+Akhil Kedia
 Aki Koskinen
 Akos Pasztory
 Akshay Vernekar
 Alain Danteny
+Alan Jenkins
 Alan Pinstein
 Albert Chin-A-Young
 Albert Choy
@@ -159,6 +161,7 @@
 Benoit Sigoure
 Bernard Leak
 Bernard Spil
+Bernhard M. Wiedemann
 Bernhard Reutner-Fischer
 Bert Huijben
 Bertrand Demiddelaer
@@ -190,6 +193,7 @@
 Brent Beardsley
 Brian Akins
 Brian Carpenter
+Brian Childs
 Brian Chrisman
 Brian Dessent
 Brian J. Murrell
@@ -223,6 +227,7 @@
 Chih-Chung Chang
 Chris "Bob Bob"
 Chris Araman
+Chris Carlmar
 Chris Combes
 Chris Conlon
 Chris Deidun
@@ -414,6 +419,7 @@
 Edward Kimmel
 Edward Rudd
 Edward Sheldrake
+Edward Thomson
 Eelco Dolstra
 Eetu Ojanen
 Egon Eckert
@@ -543,6 +549,7 @@
 Gunter Knauf
 Gustaf Hui
 Gustavo Grieco
+GwanYeong Kim
 Gwenole Beauchesne
 Gökhan Şengün
 Götz Babin-Ebell
@@ -562,6 +569,7 @@
 Heikki Korpela
 Heinrich Ko
 Heinrich Schaefer
+Helmut K. C. Tessarek
 Helwing Lutz
 Hendrik Visage
 Henrik Gaßmann
@@ -792,6 +800,7 @@
 Keshav Krity
 Kevin Baughman
 Kevin Fisk
+Kevin Ji
 Kevin Lussier
 Kevin Reed
 Kevin Roth
@@ -848,6 +857,7 @@
 Lisa Xu
 Liviu Chircu
 Liza Alenchery
+Lloyd Fournier
 Lluís Batlle i Rossell
 Loic Dachary
 Loren Kirkby
@@ -870,6 +880,7 @@
 Maciej Karpiuk
 Maciej Puzio
 Maciej W. Rozycki
+Mahmoud Samir Fayed
 Maks Naumov
 Maksim Kuzevanov
 Maksim Stsepanenka
@@ -951,6 +962,7 @@
 Maurice Barnum
 Mauro Iorio
 Mauro Rappa
+Max Dymond
 Max Katsev
 Max Khon
 Maxim Ivanov
@@ -1137,6 +1149,7 @@
 Petr Novak
 Petr Pisar
 Phil Blundell
+Phil Crump
 Phil Karn
 Phil Lisiecki
 Phil Pellouchoud
@@ -1151,6 +1164,7 @@
 Pierre Chapuis
 Pierre Joye
 Pierre Ynard
+Piotr Dobrogost
 Pooyan McSporran
 Pramod Sharma
 Prash Dush
@@ -1209,6 +1223,7 @@
 Richard Gorton
 Richard Gray
 Richard Hosking
+Richard Hsu
 Richard Michael
 Richard Moore
 Richard Prescott
@@ -1250,6 +1265,7 @@
 Roman Koifman
 Roman Mamedov
 Romulo A. Ceccon
+Ron Eldor
 Ron Parker
 Ron Zapp
 Ronnie Mose
@@ -1263,6 +1279,7 @@
 Ryan Nelson
 Ryan Schmidt
 Ryan Scott
+Ryuichi KAWAMATA
 Rémy Léone
 S. Moonesamy
 Salvador Dávila
@@ -1361,6 +1378,7 @@
 Steven M. Schweda
 Steven Parkes
 Stoned Elipot
+Stuart Henderson
 Sune Ahlgren
 Sven Anders
 Sven Neuhaus
@@ -1378,6 +1396,7 @@
 Tatsuhiro Tsujikawa
 Temprimus
 Terri Oda
+TheAssassin at github
 Theodore Dubois
 Thomas Braun
 Thomas Glanzmann
@@ -1468,6 +1487,7 @@
 Viktor Szakáts
 Ville Skyttä
 Vilmos Nebehaj
+Vincas Razma
 Vincent Bronner
 Vincent Le Normand
 Vincent Penquerc'h
@@ -1526,8 +1546,10 @@
 asavah on github
 baumanj on github
 bsammon on github
+canavan at github
 dkjjr89 on github
 eXeC64 on github
+jonrumsey at github
 jonrumsey on github
 jveazey on github
 ka7 on github
@@ -1543,11 +1565,13 @@
 nk
 nopjmp on github
 silveja1 on github
+stootill at github
 swalkaus at yahoo.com
 tarek112 on github
 tommink[at]post.pl
 vanillajonathan on github
 wmsch on github
+wyattoday at github
 zelinchen on github
 İsmail Dönmez
 Štefan Kremeň