diff --git a/scripts/scan-dmidecode b/scripts/scan-dmidecode
index 7a693aa..1351c3c 100755
--- a/scripts/scan-dmidecode
+++ b/scripts/scan-dmidecode
@@ -1,3 +1,12 @@
 #!/bin/bash
 
+MY_SERIAL=`dmidecode -s chassis-serial-number`
+MY_DATETIME=`date +%Y-%m-%d_%H-%M-%S`
+OUTPUT_DIR=/output/hwtests/$MY_SERIAL/$MY_DATETIME
+export OUTPUT_DIR
+mkdir -vp $OUTPUT_DIR
+
+if [ ! -f $OUTPUT_DIR/dmidecode ] ; then
+	dmidecode > $OUTPUT_DIR/dmidecode
+fi