diff --git a/cake/basics.php b/cake/basics.php
index da0d6707b..f4c5b62c9 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -764,10 +764,15 @@
  * Only runs if debug level is non-zero.
  *
  * @param boolean $var		Variable to show debug information for.
- * @param boolean $show_html	If set to true, the method prints the debug data in a screen-friendly way.
+ * @param boolean $showHtml	If set to true, the method prints the debug data in a screen-friendly way.
+ * @param boolean $showFrom	If set to true, the method prints from where the function was called.
  */
-	function debug($var = false, $showHtml = false) {
+	function debug($var = false, $showHtml = false, $showFrom = true) {
 		if (Configure::read() > 0) {
+			if ($showFrom) {
+				$calledFrom = debug_backtrace();
+				print "<strong>".substr(r(ROOT, "", $calledFrom[0]['file']), 1)."</strong> (line <strong>".$calledFrom[0]['line']."</strong>)";
+			}
 			print "\n<pre class=\"cake_debug\">\n";
 			ob_start();
 			print_r($var);
@@ -950,10 +955,15 @@
  * the output of given array. Similar to debug().
  *
  * @see	debug()
- * @param array	$var Variable to print out
+ * @param array $var Variable to print out
+ * @param boolean $showFrom If set to true, the method prints from where the function was called
  */
 	function pr($var) {
 		if (Configure::read() > 0) {
+			if ($showFrom) {
+				$calledFrom = debug_backtrace();
+				print "<strong>".substr(r(ROOT, "", $calledFrom[0]['file']), 1)."</strong> (line <strong>".$calledFrom[0]['line']."</strong>)";
+			}
 			echo "<pre>";
 			print_r($var);
 			echo "</pre>";
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 794a2759b..f9c9e4ed5 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -159,7 +159,7 @@ class Debugger extends Object {
 		$out = "<a href='javascript:void(0);' onclick='{$link}'><b>{$error}</b> ({$code})</a>: {$description} [<b>{$file}</b>, line <b>{$line}</b>]";
 
 		if (Configure::read() > 0) {
-			debug($out);
+			debug($out, false, false);
 			e('<div id="CakeStackTrace' . count($_this->errors) . '" class="cake-stack-trace" style="display: none;">');
 			if (!empty($context)) {
 				$link = "document.getElementById(\"CakeErrorContext" . count($_this->errors) . "\").style.display = (document.getElementById(\"CakeErrorContext" . count($_this->errors) . "\").style.display == \"none\" ? \"\" : \"none\")";
@@ -184,10 +184,10 @@ class Debugger extends Object {
 
 		if (Configure::read() > 0) {
 			e("<div id=\"CakeErrorCode" . count($_this->errors) . "\" class=\"cake-code-dump\" style=\"display: none;\">");
-			pr(implode("\n", $listing));
+			pr(implode("\n", $listing), false);
 			e('</div>');
 
-			pr($_this->trace(array('start' => 1)));
+			pr($_this->trace(array('start' => 1)), false);
 			e('</div>');
 		}
 
@@ -440,4 +440,4 @@ if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
 	Debugger::invoke(Debugger::getInstance());
 }
 
-?>
\ No newline at end of file
+?>