diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index 35d426aa3ea..28953582f0a 100644
--- a/src/gallium/drivers/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
@@ -23,8 +23,8 @@ C_SOURCES = \
 	sp_state_blend.c \
 	sp_state_clip.c \
 	sp_state_derived.c \
-	sp_state_fs.c \
 	sp_state_sampler.c \
+	sp_state_shader.c \
 	sp_state_so.c \
 	sp_state_rasterizer.c \
 	sp_state_surface.c \
diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index be5917a6886..d5f4d28aeff 100644
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -24,9 +24,9 @@ softpipe = env.ConvenienceLibrary(
 		'sp_state_blend.c',
 		'sp_state_clip.c',
 		'sp_state_derived.c',
-		'sp_state_fs.c',
 		'sp_state_rasterizer.c',
 		'sp_state_sampler.c',
+		'sp_state_shader.c',
 		'sp_state_so.c',
 		'sp_state_surface.c',
 		'sp_state_vertex.c',
diff --git a/src/gallium/drivers/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_shader.c
similarity index 100%
rename from src/gallium/drivers/softpipe/sp_state_fs.c
rename to src/gallium/drivers/softpipe/sp_state_shader.c