diff --git a/services/std_svc/spm/spm.mk b/services/std_svc/spm/spm.mk
index 562eaee..3943105 100644
--- a/services/std_svc/spm/spm.mk
+++ b/services/std_svc/spm/spm.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -11,14 +11,11 @@
         $(error "Error: SPM is only supported on aarch64.")
 endif
 
-# SPM sources
-
-
 SPM_SOURCES	:=	$(addprefix services/std_svc/spm/,	\
-			spm_main.c				\
 			${ARCH}/spm_helpers.S			\
-			secure_partition_setup.c		\
-			${ARCH}/spm_shim_exceptions.S)
+			${ARCH}/spm_shim_exceptions.S		\
+			spm_main.c				\
+			sp_setup.c)
 
 
 # Let the top-level Makefile know that we intend to include a BL32 image