diff --git a/noteworthy/source/buildship.adoc b/noteworthy/source/buildship.adoc
new file mode 100644
index 0000000..26b15d8
--- /dev/null
+++ b/noteworthy/source/buildship.adoc
@@ -0,0 +1,66 @@
+== Grade Support
+
+[[support-for-build-scans]]
+=== Support for build scans
+
+Build scans can now be enabled in the preferences. If enabled, and the
+target project applies the
+https://gradle.com/scans/get-started[com.gradle.build-scan] plugin then
+each build invocation will publish a scan.
+
+To access the scans more easily, the URLs in the console view are turned
+into clickable link.
+
+image::images/3cSh3Gi.png[scaledwidth="30%"]
+
+Besides, the Executions view contains a new toolbar action to open
+published build scans if there's one. 
+
+image::images/JLZ6u9s.png[scaledwidth="30%"]
+
+[[more-flexible-preferences]]
+=== More flexible preferences
+
+Buildship now provides all preferences, like Gradle distribution, user
+home and offline mode on three different levels: For the whole
+workspace, for a specific Gradle build or for an individual run
+configuration. The lower levels can override the settings in the upper
+levels. 
+
+[[new-project-and-import-wizard]]
+==== New project and Import wizard
+
+image::images/FyKR70z.png[scaledwidth="30%"]
+
+[[workspace-preferences]]
+==== Workspace preferences 
+
+image::images/rjAnTVx.png[scaledwidth="30%"]
+
+[[project-preferences]]
+==== Project preferences
+
+image::images/eNfczEF.png[scaledwidth="30%"]
+
+[[run-configuration]]
+==== Run configuration
+
+image::images/8Xi6L7K.png[scaledwidth="30%"]
+
+[NOTE]
+====
+Please note that the Gradle user home and the local Gradle distribution
+location are stored as absolute paths. This means if you specify them,
+then the generated configuration file should not be shared. To make this
+behavior clear we marked those preferences with warning icons.
+====
+
+[[task-and-executions-view-headers-are-shown-by-default]]
+=== Task and Executions view headers are shown by default
+
+Users repeatedly reported that the columns in the Tasks and in the
+Executions view are not wide enough and it's hard to find the `Show
+Headers` option in the view's context menu. Thus, we removed the option
+and now show the headers by default.
+
+image::images/ovVTBbr.png[scaledwidth="30%"]
\ No newline at end of file
diff --git a/noteworthy/source/images/3cSh3Gi.png b/noteworthy/source/images/3cSh3Gi.png
new file mode 100644
index 0000000..e2245bc
--- /dev/null
+++ b/noteworthy/source/images/3cSh3Gi.png
Binary files differ
diff --git a/noteworthy/source/images/8Xi6L7K.png b/noteworthy/source/images/8Xi6L7K.png
new file mode 100644
index 0000000..6a928fc
--- /dev/null
+++ b/noteworthy/source/images/8Xi6L7K.png
Binary files differ
diff --git a/noteworthy/source/images/FyKR70z.png b/noteworthy/source/images/FyKR70z.png
new file mode 100644
index 0000000..337f1cc
--- /dev/null
+++ b/noteworthy/source/images/FyKR70z.png
Binary files differ
diff --git a/noteworthy/source/images/JLZ6u9s.png b/noteworthy/source/images/JLZ6u9s.png
new file mode 100644
index 0000000..3bf4cd9
--- /dev/null
+++ b/noteworthy/source/images/JLZ6u9s.png
Binary files differ
diff --git a/noteworthy/source/images/eNfczEF.png b/noteworthy/source/images/eNfczEF.png
new file mode 100644
index 0000000..3d12130
--- /dev/null
+++ b/noteworthy/source/images/eNfczEF.png
Binary files differ
diff --git a/noteworthy/source/images/ovVTBbr.png b/noteworthy/source/images/ovVTBbr.png
new file mode 100644
index 0000000..c16cf76
--- /dev/null
+++ b/noteworthy/source/images/ovVTBbr.png
Binary files differ
diff --git a/noteworthy/source/images/rjAnTVx.png b/noteworthy/source/images/rjAnTVx.png
new file mode 100644
index 0000000..1267d5d
--- /dev/null
+++ b/noteworthy/source/images/rjAnTVx.png
Binary files differ
diff --git a/noteworthy/source/noteworthy.adoc b/noteworthy/source/noteworthy.adoc
index 17a7533..9f193f1 100644
--- a/noteworthy/source/noteworthy.adoc
+++ b/noteworthy/source/noteworthy.adoc
@@ -17,16 +17,19 @@
 :cdtPackageUrl: https://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/marsr
 :pdtPackageUrl: https://www.eclipse.org/downloads/packages/eclipse-php-developers/marsr
 
-= Eclipse Neon New and Noteworthy
+= Eclipse IDE, Oxygen Edition New and Noteworthy
 
 include::jdt.adoc[]
 
+include::buildship.adoc[]
+
 [[sources]]
 == Sources
 
 Content for this document were harvested from multiple sources, including:
 
 * http://www.eclipse.org/eclipse/news/4.7/jdt.php[Eclipse Java development tools 4.7 New and Noteworthy]
+* https://projects.eclipse.org/projects/tools.buildship/releases/2.1.0/review[Eclipse Buildship 2.1 New and Noteworthy]
 
 == Notices