diff --git a/tftf/framework/framework.mk b/tftf/framework/framework.mk
index 34601c2..4ca1d42 100644
--- a/tftf/framework/framework.mk
+++ b/tftf/framework/framework.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -8,6 +8,7 @@
 
 include lib/xlat_tables_v2/xlat_tables.mk
 include lib/compiler-rt/compiler-rt.mk
+include lib/libfdt/libfdt.mk
 
 TFTF_INCLUDES	:= 					\
 	-I${AUTOGEN_DIR} 				\
@@ -26,7 +27,8 @@
 	-Iinclude/runtime_services/secure_el1_payloads	\
 	-Ispm/cactus					\
 	-Ispm/ivy					\
-	-Ispm/quark
+	-Ispm/quark					\
+	-Ismc_fuzz/include
 
 FRAMEWORK_SOURCES	:=	${AUTOGEN_DIR}/tests_list.c
 
diff --git a/tftf/framework/tftf.ld.S b/tftf/framework/tftf.ld.S
index 364753f..9374206 100644
--- a/tftf/framework/tftf.ld.S
+++ b/tftf/framework/tftf.ld.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2020, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -75,6 +75,14 @@
     } >RAM
 
     /*
+     * The SMC fuzzing module requires alignment due to malloc
+     * constraints. Also size must be at least around 64K
+     */
+    smcfuzz (NOLOAD) : {
+        *(smcfuzz)
+    } >RAM
+
+    /*
      * The base address of the coherent memory section must be page-aligned (4K)
      * to guarantee that the coherent data are stored on their own pages and
      * are not mixed with normal data.  This is required to set up the correct