diff --git a/LICENSE b/LICENSE
index 8d88f43..3ae3bbf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -42,7 +42,7 @@
 
 This software contains source code (src/cjson.{c,h}) that is:
 
-  Copyright (c) 2009 Dave Gamble
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 2e867a1..12df5bc 100644
--- a/README.md
+++ b/README.md
@@ -97,40 +97,26 @@
 If you have a question about usage or about the code, please do *not*
 submit an issue.  Please use one of the mailing lists for that.
 
-Changes from iperf 2.x
-----------------------
+Relation to iperf 2.x
+---------------------
 
-(Note that iperf2 is no longer being developed by its original
+Note that iperf2 is no longer being developed by its original
 maintainers.  However, beginning in 2014, another developer began
 fixing bugs and enhancing functionality, and generating releases of
 iperf2.  Both projects (as of late 2017) are currently being developed
 actively, but independently.  The continuing iperf2 development
-project can be found at https://sourceforge.net/projects/iperf2/.)
+project can be found at https://sourceforge.net/projects/iperf2/.
 
-New options:
-
-    -V, --verbose             more detailed output than before
-    -J, --json                output in JSON format
-    -Z, --zerocopy            use a 'zero copy' sendfile() method of sending data
-    -O, --omit N              omit the first n seconds (to ignore slowstart)
-    -T, --title str           prefix every output line with this string
-    -F, --file name           xmit/recv the specified file
-    -A, --affinity n/n,m      set CPU affinity (Linux and FreeBSD only)
-    -k, --blockcount #[KMG]   number of blocks (packets) to transmit (instead 
-                              of -t or -n)
-    -L, --flowlabel           set IPv6 flow label (Linux only)
-
-Changed flags:
+iperf3 contains a number of options and functions not present in
+iperf2.  In addition, some flags are changed from their iperf2
+counterparts:
 
     -C, --linux-congestion    set congestion control algorithm (Linux only)
                               (-Z in iperf2)
     --bidir                   bidirectional testing mode
                               (-d in iperf2)
 
-Deprecated options:
-
-Not planning to support these iperf2 flags. If you really miss these
-options, please submit a request in the issue tracker:
+Some iperf2 options are not available in iperf3:
 
     -r, --tradeoff           Do a bidirectional test individually
     -T, --ttl                time-to-live, for multicast (default 1)
@@ -138,7 +124,7 @@
                                   S(settings) V(server) reports
     -y, --reportstyle C      report as a Comma-Separated Values
 
-Also deprecated is the ability to set the options via environment
+Also removed is the ability to set the options via environment
 variables.
 
 Known Issues
diff --git a/RELNOTES.md b/RELNOTES.md
index ff02ba9..ae52d83 100644
--- a/RELNOTES.md
+++ b/RELNOTES.md
@@ -1,6 +1,49 @@
 iperf3 Release Notes
 ====================
 
+iperf 3.8 2020-06-08
+--------------------
+
+* Notable user-visible changes
+
+  * Profiled libraries and binaries are no longer built by default
+    (#950).
+
+  * A minimal Dockerfile has been added (#824).
+
+  * A bug with burst mode and unlimited rate has been fixed (#898).
+
+  * Configuring with the --enable-static-bin flag will now cause
+    a statically-linked iperf3 binary to be built (#989).
+
+  * Configuring with the --without-sctp flag will now prevent SCTP
+    from being auto-detected (#1008).  This flag allows building a
+    static binary (see above item) on a CentOS system with SCTP
+    installed, because no static SCTP libraries are available.
+
+  * Clock skew between the iperf3 client and server will no longer
+    skew the computation of jitter during UDP tests (#842 / #990).
+
+  * A possible buffer overflow in the authentication feature has been
+    fixed.  This was only relevant when configuration authentication
+    using the libiperf3 API, and did not affect command-line usage.
+    Various other improvements and fixes in this area were also made
+    (#996).
+
+* Notable developer-visible changes
+
+  * The embedded version of cJSON has been updated to 1.3.17 (#978).
+
+  * Some server authentication functions have been added to the API
+    (#911).
+
+  * API access has been added to the connection timeout parameter
+    (#1001).
+
+  * Tests for some authentication functions have been added.
+
+  * Various compiler errors and warnings have been fixed.
+
 iperf 3.7 2019-06-21
 --------------------
 
diff --git a/configure b/configure
index 43af019..1ebaffb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for iperf 3.7+.
+# Generated by GNU Autoconf 2.69 for iperf 3.8.
 #
 # Report bugs to <https://github.com/esnet/iperf>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='iperf'
 PACKAGE_TARNAME='iperf'
-PACKAGE_VERSION='3.7+'
-PACKAGE_STRING='iperf 3.7+'
+PACKAGE_VERSION='3.8'
+PACKAGE_STRING='iperf 3.8'
 PACKAGE_BUGREPORT='https://github.com/esnet/iperf'
 PACKAGE_URL='https://software.es.net/iperf/'
 
@@ -1328,7 +1328,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures iperf 3.7+ to adapt to many kinds of systems.
+\`configure' configures iperf 3.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1398,7 +1398,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of iperf 3.7+:";;
+     short | recursive ) echo "Configuration of iperf 3.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1516,7 +1516,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-iperf configure 3.7+
+iperf configure 3.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1885,7 +1885,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by iperf $as_me 3.7+, which was
+It was created by iperf $as_me 3.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2870,7 +2870,7 @@
 
 # Define the identity of the package.
  PACKAGE='iperf'
- VERSION='3.7+'
+ VERSION='3.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14573,7 +14573,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by iperf $as_me 3.7+, which was
+This file was extended by iperf $as_me 3.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14640,7 +14640,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-iperf config.status 3.7+
+iperf config.status 3.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3c44e72..25c44bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 # file for complete information.
 
 # Initialize the autoconf system for the specified tool, version and mailing list
-AC_INIT(iperf, 3.7+, https://github.com/esnet/iperf, iperf, https://software.es.net/iperf/)
+AC_INIT(iperf, 3.8, https://github.com/esnet/iperf, iperf, https://software.es.net/iperf/)
 m4_include([config/ax_check_openssl.m4])
 m4_include([config/iperf_config_static_bin.m4])
 AC_LANG(C)
diff --git a/docs/faq.rst b/docs/faq.rst
index babf528..c7170cc 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -63,7 +63,9 @@
   #.  Configure iperf3 thusly: ``configure "LDFLAGS=--static"
       --disable-shared`` These options are necessary to disable the
       generation of shared libraries and link the executable
-      statically.
+      statically.  For iperf-3.8 or later, configuring as ``configure
+      --enable-static-bin`` is another, shorter way to accomplish
+      this.
 
   #.  Compile as normal.
 
diff --git a/src/iperf3.1 b/src/iperf3.1
index 731855e..93fe7b9 100644
--- a/src/iperf3.1
+++ b/src/iperf3.1
@@ -1,4 +1,4 @@
-.TH IPERF3 1 "June 2018" ESnet "User Manuals"
+.TH IPERF3 1 "June 2019" ESnet "User Manuals"
 .SH NAME
 iperf3 \- perform network throughput tests
 .SH SYNOPSIS