diff --git a/documentation/ChangeLog.md b/documentation/ChangeLog.md
index 0c75ec721..18b9bad69 100644
--- a/documentation/ChangeLog.md
+++ b/documentation/ChangeLog.md
@@ -1,13 +1,15 @@
 ## release ChangeLog
 
 ### (NextVersion)
+
+### 0.16.1
+ * Updated minimum CDT to version `9.0` (CDT from Eclipse Neon).
+ * Removed effectively useless "Start gocode server automatically" preference.
+ * The GOROOT environment variable is no longer set when invoking Go tools (such as `go`, `gocode`, `godef`, etc.). (#214)
+   * This causes problems with non-archive Go installations (such as those installed into `/usr/bin`), and the reason why it was set in the first place is not known - probably legacy code. Google also seems to indicate GOROOT should not be set explicitly.
  * Fixed: NPE when invoking Content Assist inside a comment, string or character.
- * Fixed 0.16.0 regression: editor open definition hyperlink (Ctrl-click) not working. (#208)
+ * Fixed 0.16.0 regression: editor open definition hyperlink (Ctrl+click) not working. (#208)
  * Fixed 0.16.0 regression: Assertion exception when opening Go files in the compare editor. (#211)
- * Updated minimum CDT to version `9.0`.
- * Removed effectively useless "Start gocode server automatically" pref.
- * The GOROOT environment variable is no longer set when invoking Go tools (`go`, `gocode`, etc.). (#214)
-   * This seems to cause problems with non-archive Go installations, and seems it's not meant to be set explicitly anyways.
 
 ### 0.16.0
  * Added documentation hover (`F2` or mouse-over the reference). Also documentation added to code completion popup. 
diff --git a/feature/feature.xml b/feature/feature.xml
index 4b5fd18be..9f99fd6f1 100644
--- a/feature/feature.xml
+++ b/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="goclipse_feature"
       label="%featureName"
-      version="0.16.0.qualifier"
+      version="0.16.1.qualifier"
       provider-name="%providerName"
       plugin="com.googlecode.goclipse.jvmcheck">
 
diff --git a/feature/pom.xml b/feature/pom.xml
index 6ffa2aae4..d1405f14b 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>goclipse_feature</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugin_ide.core.tests/META-INF/MANIFEST.MF b/plugin_ide.core.tests/META-INF/MANIFEST.MF
index 6cc56167b..460a45bbb 100644
--- a/plugin_ide.core.tests/META-INF/MANIFEST.MF
+++ b/plugin_ide.core.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.googlecode.goclipse.core.tests;singleton:=true
-Bundle-Version: 0.16.0.qualifier
+Bundle-Version: 0.16.1.qualifier
 Fragment-Host: com.googlecode.goclipse.core
 Bundle-Vendor: %pluginProvider
 Bundle-Name: %pluginNameTests
diff --git a/plugin_ide.core.tests/pom.xml b/plugin_ide.core.tests/pom.xml
index 053ecd472..cb7053c53 100644
--- a/plugin_ide.core.tests/pom.xml
+++ b/plugin_ide.core.tests/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	
 	<artifactId>com.googlecode.goclipse.core.tests</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/plugin_ide.core/META-INF/MANIFEST.MF b/plugin_ide.core/META-INF/MANIFEST.MF
index 271addc56..b21b7d45d 100644
--- a/plugin_ide.core/META-INF/MANIFEST.MF
+++ b/plugin_ide.core/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.googlecode.goclipse.core;singleton:=true
-Bundle-Version: 0.16.0.qualifier
+Bundle-Version: 0.16.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/plugin_ide.core/pom.xml b/plugin_ide.core/pom.xml
index 044073e71..729bb6d3b 100644
--- a/plugin_ide.core/pom.xml
+++ b/plugin_ide.core/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>com.googlecode.goclipse.core</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugin_ide.debug/META-INF/MANIFEST.MF b/plugin_ide.debug/META-INF/MANIFEST.MF
index dc046cce0..1d452d814 100644
--- a/plugin_ide.debug/META-INF/MANIFEST.MF
+++ b/plugin_ide.debug/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.googlecode.goclipse.debug;singleton:=true
-Bundle-Version: 0.16.0.qualifier
+Bundle-Version: 0.16.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/plugin_ide.debug/pom.xml b/plugin_ide.debug/pom.xml
index 6e4436b87..c396b995c 100644
--- a/plugin_ide.debug/pom.xml
+++ b/plugin_ide.debug/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>com.googlecode.goclipse.debug</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugin_ide.ui.tests/META-INF/MANIFEST.MF b/plugin_ide.ui.tests/META-INF/MANIFEST.MF
index 40e07d2f8..f87a18ab6 100644
--- a/plugin_ide.ui.tests/META-INF/MANIFEST.MF
+++ b/plugin_ide.ui.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.googlecode.goclipse.ui.tests;singleton:=true
-Bundle-Version: 0.16.0.qualifier
+Bundle-Version: 0.16.1.qualifier
 Fragment-Host: com.googlecode.goclipse.ui
 Bundle-Vendor: %pluginProvider
 Bundle-Name: %pluginNameTests
diff --git a/plugin_ide.ui.tests/pom.xml b/plugin_ide.ui.tests/pom.xml
index 5fb731ccd..8d5027343 100644
--- a/plugin_ide.ui.tests/pom.xml
+++ b/plugin_ide.ui.tests/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>com.googlecode.goclipse.ui.tests</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/plugin_ide.ui/META-INF/MANIFEST.MF b/plugin_ide.ui/META-INF/MANIFEST.MF
index 3acd9dca8..263ee0e2e 100644
--- a/plugin_ide.ui/META-INF/MANIFEST.MF
+++ b/plugin_ide.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.googlecode.goclipse.ui;singleton:=true
-Bundle-Version: 0.16.0.qualifier
+Bundle-Version: 0.16.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/plugin_ide.ui/pom.xml b/plugin_ide.ui/pom.xml
index 8552a4fd2..0ee97efd8 100644
--- a/plugin_ide.ui/pom.xml
+++ b/plugin_ide.ui/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>com.googlecode.goclipse.ui</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugin_tooling/META-INF/MANIFEST.MF b/plugin_tooling/META-INF/MANIFEST.MF
index 284d643ba..4d6b578fa 100644
--- a/plugin_tooling/META-INF/MANIFEST.MF
+++ b/plugin_tooling/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: com.googlecode.goclipse.tooling;singleton:=true
-Bundle-Version: 0.16.0.qualifier
+Bundle-Version: 0.16.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/plugin_tooling/pom.xml b/plugin_tooling/pom.xml
index d7a26010d..2787fc32c 100644
--- a/plugin_tooling/pom.xml
+++ b/plugin_tooling/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>com.googlecode.goclipse.tooling</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.16.1-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>