diff --git a/conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile b/conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
index 6e22edbcc00..6202acf1b8d 100644
--- a/conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
+++ b/conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
@@ -11,11 +11,11 @@ endif
 
 
 ifeq ($(NORADIO), False)
-  $(TARGET).CFLAGS	+= -DRADIO_CONTROL
-	$(TARGET).CFLAGS 	+= -DRADIO_CONTROL_TYPE_H=\"radio_control/rc_datalink.h\"
-	$(TARGET).CFLAGS 	+= -DRADIO_CONTROL_TYPE_DATALINK
-  $(TARGET).srcs		+= $(SRC_SUBSYSTEMS)/radio_control.c
-  $(TARGET).srcs		+= $(SRC_SUBSYSTEMS)/radio_control/rc_datalink.c
+  $(TARGET).CFLAGS += -DRADIO_CONTROL
+  $(TARGET).CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/rc_datalink.h\"
+  $(TARGET).CFLAGS += -DRADIO_CONTROL_TYPE_DATALINK
+  $(TARGET).srcs   += $(SRC_SUBSYSTEMS)/radio_control.c
+  $(TARGET).srcs   += $(SRC_SUBSYSTEMS)/radio_control/rc_datalink.c
 # arch only with sim target for compatibility (empty functions)
-	sim.srcs					+= $(SRC_ARCH)/subsystems/radio_control/rc_datalink.c
+  sim.srcs += $(SRC_ARCH)/subsystems/radio_control/rc_datalink.c
 endif
diff --git a/sw/ground_segment/misc/Makefile b/sw/ground_segment/misc/Makefile
index 35ff00d8c99..ef30360fc51 100644
--- a/sw/ground_segment/misc/Makefile
+++ b/sw/ground_segment/misc/Makefile
@@ -2,21 +2,21 @@ UNAME = $(shell uname -s)
 
 ifeq ("$(UNAME)","Darwin")
   LIBRARYS = -L/opt/local/lib
-else 
-  LIBRARYS = -s 
+else
+  LIBRARYS = -s
 endif
 
 
 all: davis2ivy kestrel2ivy
 
 clean:
-	rm *.o davis2ivy kestrel2ivy
+    rm *.o davis2ivy kestrel2ivy
 
 davis2ivy: davis2ivy.o
-	g++ -o davis2ivy davis2ivy.o  $(LIBRARYS)  -livy
+    g++ -o davis2ivy davis2ivy.o  $(LIBRARYS)  -livy
 
 kestrel2ivy: kestrel2ivy.o
-	g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
+    g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
 
 %.o : %.c
-	gcc -c -O2 -Wall -I /opt/local/include/  $<
+    gcc -c -O2 -Wall -I /opt/local/include/  $<