diff --git a/deployments/libsp/opteesp/CMakeLists.txt b/deployments/libsp/opteesp/CMakeLists.txt
index 6f3907f..19dede4 100644
--- a/deployments/libsp/opteesp/CMakeLists.txt
+++ b/deployments/libsp/opteesp/CMakeLists.txt
@@ -25,20 +25,11 @@
 
 add_library(sp STATIC)
 
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit COMPONENTS interface)
-
-target_link_libraries(sp PUBLIC ${SP_DEV_KIT_LIBRARIES})
-
-
 add_components(TARGET "sp"
 	BASE_DIR ${TS_ROOT}
 	COMPONENTS
 		components/messaging/ffa/libsp
 		components/common/utils
-		environments/opteesp
 )
 
 target_compile_definitions("sp" PRIVATE
@@ -48,6 +39,7 @@
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
 	target_compile_options("sp" PRIVATE
 		-fdiagnostics-show-option
+		-fpic
 		-gdwarf-2
 		-mstrict-align
 		-O0
@@ -73,9 +65,6 @@
 		libsp
 )
 
-#These would install the spdevkit content.
-#install(FILES $<TARGET_PROPERTY:sp_devkit_ifc,INTERFACE_LINK_LIBRARIES> DESTINATION lib)
-#install(FILES $<TARGET_PROPERTY:sp_devkit_ifc,INTERFACE_INCLUDE_DIRECTORIES>/ DESTINATION include)
 ### Create a config file package.
 set(ConfigPackageLocation ${TS_ENV}/lib/cmake/libsp)
 
@@ -124,7 +113,6 @@
 	FILES
 		"${CMAKE_CURRENT_BINARY_DIR}/LibspConfig.cmake"
 		"${CMAKE_CURRENT_BINARY_DIR}/LibspConfigVersion.cmake"
-		"${TS_ROOT}/external/Spdevkit/FindSpdevkit.cmake"
 	DESTINATION
 		${ConfigPackageLocation}
 	COMPONENT
diff --git a/deployments/libsp/opteesp/LibspConfig.cmake.in b/deployments/libsp/opteesp/LibspConfig.cmake.in
index cd8d0d6..559b35d 100644
--- a/deployments/libsp/opteesp/LibspConfig.cmake.in
+++ b/deployments/libsp/opteesp/LibspConfig.cmake.in
@@ -1,16 +1,9 @@
 #
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 @PACKAGE_INIT@
 
-# Any user of the lib will depend on spdevkit. Use our find module to get access to it.
-find_package(Spdevkit
-	 COMPONENTS LIBUTIL
-	 PATHS ${CMAKE_CURRENT_LIST_DIR}
-	 NO_DEFAULT_PATH
-	 REQUIRED)
-
 include("${CMAKE_CURRENT_LIST_DIR}/LibspTargets.cmake")