diff --git a/trunk/report_templates/NTUSER_Autoruns.qs b/trunk/report_templates/NTUSER_Autoruns.qs
new file mode 100644
index 0000000..d166110
--- /dev/null
+++ b/trunk/report_templates/NTUSER_Autoruns.qs
@@ -0,0 +1,49 @@
+function IsValid(val) {
+ if(typeof val !== 'undefined') return true;
+ else return false;
+}
+
+function print_table_row(cell01,cell02) {
+ println(" | ",cell01," | ",cell02," |
");
+}
+
+function ListAutoruns(autorun_path,autorun_key) {
+ println(" ");
+ println(" "+autorun_key+"
");
+ var run_keys=GetRegistryKeys(autorun_path+autorun_key);
+ if(IsValid(run_keys) && run_keys.length>0) {
+ println("
");
+ print_table_row("Name","Executable");
+
+ for(var i=0;i");
+ } else {
+ println(" None");
+ }
+ println(" ");
+}
+
+// Global vars
+var val;
+
+println("");
+println(" User Autoruns");
+println(" ");
+println(" User Autoruns
");
+
+// Run
+ListAutoruns("\\Microsoft\\Windows\\CurrentVersion\\","Run");
+
+// RunOnce
+ListAutoruns("\\Microsoft\\Windows\\CurrentVersion\\","RunOnce");
+
+// RunOnceEx
+ListAutoruns("\\Microsoft\\Windows\\CurrentVersion\\","RunOnceEx");
+
+// TODO: There might be a Run under WindowsNT\CurrentVersion\Run too!
+
+println("");
diff --git a/trunk/report_templates/SOFTWARE_Autoruns.qs b/trunk/report_templates/SOFTWARE_Autoruns.qs
new file mode 100644
index 0000000..11e259d
--- /dev/null
+++ b/trunk/report_templates/SOFTWARE_Autoruns.qs
@@ -0,0 +1,49 @@
+function IsValid(val) {
+ if(typeof val !== 'undefined') return true;
+ else return false;
+}
+
+function print_table_row(cell01,cell02) {
+ println(" | ",cell01," | ",cell02," |
");
+}
+
+function ListAutoruns(autorun_path,autorun_key) {
+ println(" ");
+ println(" "+autorun_key+"
");
+ var run_keys=GetRegistryKeys(autorun_path+autorun_key);
+ if(IsValid(run_keys) && run_keys.length>0) {
+ println("
");
+ print_table_row("Name","Executable");
+
+ for(var i=0;i");
+ } else {
+ println(" None");
+ }
+ println(" ");
+}
+
+// Global vars
+var val;
+
+println("");
+println(" System Autoruns");
+println(" ");
+println(" System Autoruns
");
+
+// Run
+ListAutoruns("\\Microsoft\\Windows\\CurrentVersion\\","Run");
+
+// RunOnce
+ListAutoruns("\\Microsoft\\Windows\\CurrentVersion\\","RunOnce");
+
+// RunOnceEx
+ListAutoruns("\\Microsoft\\Windows\\CurrentVersion\\","RunOnceEx");
+
+// TODO: There might be a Run under WindowsNT\CurrentVersion\Run too!
+
+println("");