diff --git a/VERSION b/VERSION
index 2d85e72..b52c0e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,3 @@
 # The release version and build number of the stackdriver-agent package.
-PKG_VERSION=6.1.3
+PKG_VERSION=6.2.0
 PKG_BUILD=1
diff --git a/collectd.conf b/collectd.conf
index 9178950..6e23e02 100644
--- a/collectd.conf
+++ b/collectd.conf
@@ -124,7 +124,10 @@ PostCacheChain "PostCache"
   </Rule>
 </Chain>
 
-# if you have other config, especially for plugins, you can drop them
-# into this directory
+# Obsolete config directory for backward compatibility.
 Include "/opt/stackdriver/collectd/etc/collectd.d"
-Include "/etc/stackdriver/collectd.d"
+# If you have other config, especially for plugins, you can drop them
+# into this directory.
+<Include "/etc/stackdriver/collectd.d">
+  Filter "*.conf"
+</Include>