diff --git a/hot/log-apply-result.js b/hot/log-apply-result.js
index 9a0dd6507..e279c6721 100644
--- a/hot/log-apply-result.js
+++ b/hot/log-apply-result.js
@@ -20,10 +20,14 @@ module.exports = function(updatedModules, renewedModules) {
 	} else {
 		log("info", "[HMR] Updated modules:");
 		renewedModules.forEach(function(moduleId) {
-			if(moduleId.lastIndexOf) {
-				moduleId = moduleId.substring(moduleId.lastIndexOf("!") + 1);
+			if(typeof moduleId === "string") {
+				var parts = moduleId.split("!");
+				log.groupCollapsed("[HMR]  - " + parts.pop());
+				log("info", "[HMR]  - " + moduleId);
+				log.groupEnd();
+			} else {
+				log("info", "[HMR]  - " + moduleId);
 			}
-			log("info", "[HMR]  - " + moduleId);
 		});
 		var numberIds = renewedModules.every(function(moduleId) {
 			return typeof moduleId === "number";
diff --git a/hot/log.js b/hot/log.js
index b0af5645e..41419fa7f 100644
--- a/hot/log.js
+++ b/hot/log.js
@@ -1,5 +1,7 @@
 var logLevel = "info";
 
+function dummy() { }
+
 module.exports = function(level, msg) {
 	if(logLevel === "info" && level === "info")
 		return console.log(msg);
@@ -9,6 +11,12 @@ module.exports = function(level, msg) {
 		return console.error(msg);
 };
 
+module.exports.group = console.group || dummy;
+
+module.exports.groupCollapsed = console.groupCollapsed || dummy;
+
+module.exports.groupEnd = console.groupEnd || dummy;
+
 module.exports.setLogLevel = function(level) {
 	logLevel = level;
 };