diff --git a/plugins_install/diehard.sh b/plugins_install/diehard.sh
index d10f56a631aeda58074bb5b52b42ce88f4a81a41..204a17a31e1d5321139241b6ac0bb03c9c79920b 100755
--- a/plugins_install/diehard.sh
+++ b/plugins_install/diehard.sh
@@ -6,5 +6,40 @@ if [ ! -f $CFAR_HOME/DieHard/src/libdiehard.so ]; then
 fi
 
 $PEASOUP_HOME/tools/update_env_var.sh DO_DIEHARD 1
-cp $CFAR_HOME/DieHard/src/libdiehard.so libheaprand.so
+
+
+seq=""
+while [[ $# -gt 0 ]]
+do
+key="$1"
+case $key in
+	--structured_heap)
+		seq="$2"
+		shift
+	;;
+	*)
+		shift;
+	;;
+esac
+done
+
+if [ -z "$seq" ]; then
+	cp $CFAR_HOME/DieHard/src/libdiehard.so libheaprand.so
+else
+	if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-4k.so ]; then
+		echo "ERROR: DieHard library not built/found" | tee warning.txt
+		exit 1
+	fi
+
+	if [ ! -f $CFAR_HOME/DieHard/src/libdiehard-32k.so ]; then
+		echo "ERROR: DieHard library not built/found" | tee warning.txt
+		exit 1
+	fi
+
+	if [ $(expr ${seq} % 2) = 0 ]; then
+		cp $CFAR_HOME/DieHard/src/libdiehard-32k.so libheaprand.so
+	else
+		cp $CFAR_HOME/DieHard/src/libdiehard-4k.so libheaprand.so
+	fi
+fi