diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 70bbe38e46..7c3f27396c 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -36,7 +36,7 @@
         <dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
         
         <!-- timeline and image analyzer -->
-        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.10" />
+        <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
 
         <!-- timeline  -->
         <dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" />
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 7b1b68be8a..da6ee3ad6d 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -16,7 +16,7 @@ file.reference.commons-logging-1.1.2-javadoc.jar=release/modules/ext/commons-log
 file.reference.commons-logging-1.1.2-sources.jar=release/modules/ext/commons-logging-1.1.2-sources.jar
 file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
 file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar
-file.reference.controlsfx-8.40.10.jar=release/modules/ext/controlsfx-8.40.10.jar
+file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar
 file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
 file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
 file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
@@ -72,14 +72,14 @@ file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-javadoc.jar
-javadoc.reference.controlsfx-8.40.10.jar=release/modules/ext/controlsfx-8.40.10-javadoc.jar
+javadoc.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-javadoc.jar
 javadoc.reference.guava-18.0.jar=release/modules/ext/guava-18.0-javadoc.jar
 javadoc.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar
 nbm.needs.restart=true
 source.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-sources.jar
-source.reference.controlsfx-8.40.10.jar=release/modules/ext/controlsfx-8.40.10-sources.jar
+source.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-sources.jar
 source.reference.guava-18.0.jar=release/modules/ext/guava-18.0-sources.jar
 source.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-sources.jar
 source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 22b2a8cfe4..2b6af06837 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -919,8 +919,8 @@
                 <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/controlsfx-8.40.10.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/controlsfx-8.40.10.jar</binary-origin>
+                <runtime-relative-path>ext/controlsfx-8.40.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/controlsfx-8.40.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
diff --git a/build.xml b/build.xml
index c898e32189..3fcfb0ebab 100755
--- a/build.xml
+++ b/build.xml
@@ -15,6 +15,7 @@
         <or>
             <matches string="${java.version}" pattern="1\.8\.0_6[6-9]"/>
             <matches string="${java.version}" pattern="1\.8\.0_[7-9][0-9]"/>
+         <matches string="${java.version}" pattern="1\.8\.0_[1-9][0-9][0-9]"/>
             <matches string="${java.version}" pattern="1\.8\.[1-9]_[0-9][0-9]"/>
             <equals arg1="${ant.java.version}" arg2="1.9"/>
         </or>