diff --git a/build/build.xml b/build/build.xml
index c5fcfb678..e6782b908 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -240,11 +240,12 @@
     <download-library name="Keyboard" version="1.0.1"/>
     <download-library name="SD" version="1.1.1"/>
     <download-library name="Servo" version="1.1.2"/>
-    <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
+    <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.8" foldername="Adafruit_Circuit_Playground"/>
   </target>
 
   <macrodef name="download-library">
     <attribute name="name"/>
+    <attribute name="foldername" default="@{name}"/>
     <attribute name="version"/>
     <attribute name="tag" default="@{version}"/>
     <attribute name="githubuser" default="arduino-libraries"/>
@@ -255,7 +256,7 @@
         <param name="final_folder" value="${target.path}/libraries/@{name}-@{version}"/>
         <param name="dest_folder" value="${target.path}/libraries"/>
       </antcall>
-      <move file="${target.path}/libraries/@{name}-@{version}" tofile="${target.path}/libraries/@{name}"/>
+      <move file="${target.path}/libraries/@{name}-@{version}" tofile="${target.path}/libraries/@{foldername}"/>
     </sequential>
   </macrodef>
 
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 45576d99f..fbd0b2fe8 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -5,6 +5,9 @@ ARDUINO 1.8.4
 * Environment variable LIBRARY_INDEX_URL is now correctly parsed (LIBRARY_INDEX_URL_GZ can also be optinally specified). Thanks @xardael
 * Added per-board generic option in config file boards.txt for disabling control of dtr+rts. Thanks @d-a-v
 
+[libraries]
+* Fixed wrong folder name for "Adafruit Circuit Playground" library, now it can be updated cleanly.
+
 ARDUINO 1.8.3 2017.05.31
 
 (bugfix service release)