diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f4b2e9ed8a8..71ce5f5101c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* NEWS (Changes in GDB 8.0): Remove extra empty line.  Move
+	"Removed targets and native configurations" up.  Merge duplicate
+	"New commands" sub-sections.  Add "New options" sub-sections.
+
 2017-05-26  Eli Zaretskii  <eliz@gnu.org>
 
 	* cli/cli-script.c (user_args::insert_args): Call gdb::to_string.
diff --git a/gdb/NEWS b/gdb/NEWS
index 7b870982c79..e5ddcbf3fab 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -70,17 +70,34 @@
 
 FreeBSD/mips			mips*-*-freebsd
 
-
 * New targets
 
 Synopsys ARC			arc*-*-elf32
 FreeBSD/mips			mips*-*-freebsd
 
+* Removed targets and native configurations
+
+Alpha running FreeBSD         alpha*-*-freebsd*
+Alpha running GNU/kFreeBSD    alpha*-*-kfreebsd*-gnu
+
 * New commands
 
 flash-erase
   Erases all the flash memory regions reported by the target.
 
+maint print arc arc-instruction address
+  Print internal disassembler information about instruction at a given address.
+
+* New options
+
+set disassembler-options
+show disassembler-options
+  Controls the passing of target specific information to the disassembler.
+  If it is necessary to specify more than one disassembler option then
+  multiple options can be placed together into a comma separated list.
+  The default value is the empty string.  Currently, the only supported
+  targets are ARM, PowerPC and S/390.
+
 * New MI commands
 
 -target-flash-erase
@@ -91,24 +108,6 @@ flash-erase
   List the shared libraries in the program.  This is
   equivalent to the CLI command "info shared".
 
-* New commands
-
-set disassembler-options
-show disassembler-options
-  Controls the passing of target specific information to the disassembler.
-  If it is necessary to specify more than one disassembler option then
-  multiple options can be placed together into a comma separated list.
-  The default value is the empty string.  Currently, the only supported
-  targets are ARM, PowerPC and S/390.
-
-maint print arc arc-instruction address
-  Print internal disassembler information about instruction at a given address.
-
-* Removed targets and native configurations
-
-Alpha running FreeBSD         alpha*-*-freebsd*
-Alpha running GNU/kFreeBSD    alpha*-*-kfreebsd*-gnu
-
 *** Changes in GDB 7.12
 
 * GDB and GDBserver now build with a C++ compiler by default.