diff --git a/CHANGES b/CHANGES
index b809ddfd..6ec934d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 21 Mar 2007 - trunk
 -------------------
 
+* Store filename/line for each rule and display it and the ID (if available)
+  in the debug log when invoking a rule.  Thanks to Christian Bockermann
+  for the idea.
+
 * Do not log 'allow' action as intercepted in the debug log.
 
 * Optimize regex execution to not capture unless 'capture' action used.
diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c
index b19ea014..5c64b820 100644
--- a/apache2/apache2_config.c
+++ b/apache2/apache2_config.c
@@ -422,7 +422,7 @@ static const char *add_rule(cmd_parms *cmd, directory_config *dcfg, const char *
     }
 
     /* Create the rule now. */
-    rule = msre_rule_create(dcfg->ruleset, p1, p2, p3, &my_error_msg);
+    rule = msre_rule_create(dcfg->ruleset, cmd->directive->filename, cmd->directive->line_num, p1, p2, p3, &my_error_msg);
     if (rule == NULL) {
         return my_error_msg;
     }
diff --git a/apache2/re.c b/apache2/re.c
index 280eddde..5011e041 100644
--- a/apache2/re.c
+++ b/apache2/re.c
@@ -703,7 +703,17 @@ apr_status_t msre_ruleset_process_phase(msre_ruleset *ruleset, modsec_rec *msr)
         }
 
         if (msr->txcfg->debuglog_level >= 4) {
-            msr_log(msr, 4, "Recipe: Invoking rule %x.", rule);
+            apr_pool_t *p = msr->mp;
+            const char *fn = NULL;
+            const char *id = NULL;
+            if (rule->filename != NULL) {
+                fn = apr_psprintf(p, " [%s:%d]", rule->filename, rule->line_num);
+            }
+            if (rule->actionset != NULL && rule->actionset->id != NULL) {
+                id = apr_psprintf(p, " [id \"%s\"]", rule->actionset->id);
+            }
+            msr_log(msr, 4, "Recipe: Invoking rule %x%s%s.",
+                    rule, (fn ? fn : ""), (id ? id : ""));
         }
 
         rc = msre_rule_process(rule, msr);
@@ -1008,7 +1018,8 @@ char *msre_format_metadata(modsec_rec *msr, msre_actionset *actionset) {
  * Assembles a new rule using the strings that contain a list
  * of targets (variables), argumments, and actions.
  */
-msre_rule *msre_rule_create(msre_ruleset *ruleset, const char *targets,
+msre_rule *msre_rule_create(msre_ruleset *ruleset,
+    const char *fn, int line, const char *targets,
     const char *args, const char *actions, char **error_msg)
 {
     msre_rule *rule;
@@ -1023,6 +1034,8 @@ msre_rule *msre_rule_create(msre_ruleset *ruleset, const char *targets,
     if (rule == NULL) return NULL;
     rule->ruleset = ruleset;
     rule->targets = apr_array_make(ruleset->mp, 10, sizeof(const msre_var *));
+    rule->filename = apr_pstrdup(ruleset->mp, fn);
+    rule->line_num = line;
 
     /* Parse targets */
     rc = msre_parse_targets(ruleset, targets, rule->targets, &my_error_msg);
diff --git a/apache2/re.h b/apache2/re.h
index 896e2a11..f677eceb 100644
--- a/apache2/re.h
+++ b/apache2/re.h
@@ -119,12 +119,15 @@ struct msre_rule {
     msre_op_metadata        *op_metadata;
     unsigned int             op_negated;
     msre_actionset          *actionset;
+    const char              *filename;
+    int                      line_num;
     
     msre_ruleset            *ruleset;
     msre_rule               *chain_starter;
 };
 
-msre_rule *msre_rule_create(msre_ruleset *ruleset, const char *targets,
+msre_rule *msre_rule_create(msre_ruleset *ruleset,
+    const char *fn, int line, const char *targets,
     const char *args, const char *actions, char **error_msg);
 
 void msre_rule_actionset_init(msre_rule *rule);