diff --git a/core/src/main/cfml/context/admin/debugging.logs.cfm b/core/src/main/cfml/context/admin/debugging.logs.cfm
index 791acc55f8..87c39cb798 100755
--- a/core/src/main/cfml/context/admin/debugging.logs.cfm
+++ b/core/src/main/cfml/context/admin/debugging.logs.cfm
@@ -147,13 +147,19 @@ Redirtect to entry --->
     
     <cfreturn (time/1000000)&" ms">
 </cffunction> 
-    
-
+<cfscript>
+	param name="url.action2" default="list";
+	param name="url.format" default="";
 
-<cfparam name="url.action2" default="list">
-
-<cfif url.action2 EQ "list">
-	<cfinclude template="debugging.logs.list.cfm">
-<cfelse>
-	<cfinclude template="debugging.logs.detail.cfm">
-</cfif>
+	if (url.action2 EQ "list") {
+		if (url.format eq "json") {
+			setting showdebugoutput="false";
+			content reset="yes" type="application/json";
+			echo(serializeJson(logs));
+			abort;		
+		}
+		include template="debugging.logs.list.cfm";
+	} else {
+		include template="debugging.logs.detail.cfm";
+	}
+</cfscript>
diff --git a/core/src/main/cfml/context/admin/debugging.logs.detail.cfm b/core/src/main/cfml/context/admin/debugging.logs.detail.cfm
index 4bd628f586..0043f305fb 100755
--- a/core/src/main/cfml/context/admin/debugging.logs.detail.cfm
+++ b/core/src/main/cfml/context/admin/debugging.logs.detail.cfm
@@ -52,6 +52,13 @@
 			log=el;
 		}
 	}
+	
+	if (url.format eq "json") {
+		setting showdebugoutput="false";
+		content reset="yes" type="application/json";
+		echo(serializeJson(log));
+		abort;		
+	}
 </cfscript>
 <cfoutput>
 	<cfif !isSimpleValue(log) && structCount(drivers)>