diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
index f3bb67c2f3..b7cffb0038 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
@@ -26,9 +26,9 @@ import org.springframework.util.ClassUtils;
 /**
  * {@link LoadTimeWeaver} implementation for JBoss's instrumentable ClassLoader.
  * Autodetects the specific JBoss version at runtime: currently supports
- * JBoss AS 6 and 7 (as of Spring 4.0).
+ * JBoss AS 6 and 7, as well as WildFly 8 (as of Spring 4.0).
  *
- * <p><b>NOTE:</b> On JBoss 6.0, to avoid the container loading the classes before the
+ * <p><b>NOTE:</b> On JBoss 6, to avoid the container loading the classes before the
  * application actually starts, one needs to add a <tt>WEB-INF/jboss-scanning.xml</tt>
  * file to the application archive - with the following content:
  * <pre class="code">&lt;scanning xmlns="urn:jboss:scanning:1.0"/&gt;</pre>
@@ -62,7 +62,7 @@ public class JBossLoadTimeWeaver implements LoadTimeWeaver {
 	public JBossLoadTimeWeaver(ClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
 		if (classLoader.getClass().getName().startsWith("org.jboss.modules")) {
-			// JBoss AS 7
+			// JBoss AS 7 or WildFly 8
 			this.adapter = new JBossModulesAdapter(classLoader);
 		}
 		else {
diff --git a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
index 3047232148..fcc2c29f37 100644
--- a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
@@ -28,11 +28,11 @@ import java.net.URL;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Utility for detecting the JBoss VFS version available in the classpath.
- * As of Spring 4.0, supports VFS 3.x on JBoss AS 6+ (package {@code org.jboss.vfs}).
+ * Utility for detecting and accessing JBoss VFS in the classpath.
+ * As of Spring 4.0, supports VFS 3.x on JBoss AS 6+ (package {@code org.jboss.vfs})
+ * and is in particular compatible with JBoss AS 7 and WildFly 8.
  *
  * <p>Thanks go to Marius Bogoevici for the initial patch.
- *
  * <b>Note:</b> This is an internal class and should not be used outside the framework.
  *
  * @author Costin Leau