diff --git a/doc/Changelog b/doc/Changelog
index 23032079a..99bfe508f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 September 2017: Ralph
+	- Log name of looping module
+
 19 September 2017: Wouter
 	- use a cachedb answer even if it's "expired" when serve-expired is yes
 	  (patch from Jinmei Tatuya).
diff --git a/services/mesh.c b/services/mesh.c
index 8835e9d62..3395dc62e 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1359,7 +1359,8 @@ mesh_continue(struct mesh_area* mesh, struct mesh_state* mstate,
 	mstate->num_activated++;
 	if(mstate->num_activated > MESH_MAX_ACTIVATION) {
 		/* module is looping. Stop it. */
-		log_err("internal error: looping module stopped");
+		log_err("internal error: looping module (%s) stopped",
+			mesh->mods.mod[mstate->s.curmod]->name);
 		log_query_info(VERB_QUERY, "pass error for qstate",
 			&mstate->s.qinfo);
 		s = module_error;