diff --git a/docs/framework-jrebel_agent.md b/docs/framework-jrebel_agent.md
index c1c6a5f6c8..a8923c3058 100644
--- a/docs/framework-jrebel_agent.md
+++ b/docs/framework-jrebel_agent.md
@@ -5,7 +5,7 @@ The JRebel Agent Framework causes an application to be automatically configured
 <table>
   <tr>
     <td><strong>Detection Criterion</strong></td>
-    <td>Existence of a <tt>rebel-remote.xml</tt> file inside the application archive. This file is present in every application that is configured to use <a href="http://manuals.zeroturnaround.com/jrebel/remoting/index.html" target="_blank">JRebel Cloud/Remote</a>.</td>
+    <td>Existence of a <tt>rebel-remote.xml</tt> file inside the application archive. This file is present in every application that is configured to use <a href="http://manuals.zeroturnaround.com/jrebel/remoteserver/index.html" target="_blank">JRebel Cloud/Remote</a>.</td>
   </tr>
   <tr>
     <td><strong>Tags</strong></td>
@@ -29,9 +29,9 @@ The framework can be configured by modifying the [`config/jrebel_agent.yml`][] f
 
 [Configuration and Extension]: ../README.md#configuration-and-extension
 [`config/jrebel_agent.yml`]: ../config/jrebel_agent.yml
-[JRebel Cloud/Remote]: http://manuals.zeroturnaround.com/jrebel/remoting/index.html
+[JRebel Cloud/Remote]: http://manuals.zeroturnaround.com/jrebel/remoteserver/index.html
 [JRebel]: http://zeroturnaround.com/software/jrebel/
-[pivotal]: http://manuals.zeroturnaround.com/jrebel/remoting/pivotal.html
+[pivotal]: http://manuals.zeroturnaround.com/jrebel/remoteserver/pivotal.html
 [repositories]: extending-repositories.md
 [this listing]: http://dl.zeroturnaround.com/jrebel/index.yml
 [version syntax]: extending-repositories.md#version-syntax-and-ordering
diff --git a/lib/java_buildpack/framework/jrebel_agent.rb b/lib/java_buildpack/framework/jrebel_agent.rb
index 27816b2efb..0cb0341251 100644
--- a/lib/java_buildpack/framework/jrebel_agent.rb
+++ b/lib/java_buildpack/framework/jrebel_agent.rb
@@ -49,6 +49,7 @@ def supports?
         enabled? && (
             jrebel_configured?(@application.root) ||
             jrebel_configured?(@application.root + 'WEB-INF/classes') ||
+            jrebel_configured?(@application.root + 'BOOT-INF/classes') ||
             jars_with_jrebel_configured?(@application.root))
       end