diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index caf29ad0b18..e4ef0034610 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -172,6 +172,14 @@ if HAVE_ST_XVMC
 SUBDIRS += state_trackers/xvmc targets/xvmc
 endif
 
+##
+## Don't forget to bundle the remaining (non autotools) state-trackers/targets
+##
+
+EXTRA_DIST += \
+	state_trackers/hgl targets/haiku-softpipe
+
+
 ##
 ## Gallium tests
 ##
diff --git a/src/gallium/state_trackers/hgl/SConscript b/src/gallium/state_trackers/hgl/SConscript
index 05b8214c34a..82a0ce0a34e 100644
--- a/src/gallium/state_trackers/hgl/SConscript
+++ b/src/gallium/state_trackers/hgl/SConscript
@@ -13,7 +13,7 @@ env.Append(CPPPATH = [
 
 sources = [
     'hgl.c',
-	'bitmap_wrapper.cpp',
+    'bitmap_wrapper.cpp',
 ]
 
 st_haiku = env.ConvenienceLibrary(
diff --git a/src/gallium/state_trackers/hgl/hgl.c b/src/gallium/state_trackers/hgl/hgl.c
index 1d6fa73f23f..8dcd6e315f3 100644
--- a/src/gallium/state_trackers/hgl/hgl.c
+++ b/src/gallium/state_trackers/hgl/hgl.c
@@ -95,7 +95,7 @@ hgl_st_framebuffer_validate(struct st_context_iface *stctx,
 		for (unsigned i = 0; i < count; i++) {
 			enum pipe_format format = PIPE_FORMAT_NONE;
 			unsigned bind = 0;
-	
+
 			switch(statts[i]) {
 				case ST_ATTACHMENT_FRONT_LEFT:
 				case ST_ATTACHMENT_BACK_LEFT:
diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
index d89a2afb35f..d5fd6994b25 100644
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -2,7 +2,7 @@ Import('*')
 
 env.Prepend(LIBS = [
     ws_haiku,
-	st_haiku,
+    st_haiku,
     trace,
     rbug,
     mesautil,