diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index e198a54b..e13a9d72 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -4,8 +4,8 @@ include_HEADERS = \
 	compiler.h constants.h sg_inlines.h version.h
 
 if WANT_HEADLESS
-METAR_DIRS =
 SG_EXTRA_DIRS =
+METAR_DIRS = 
 else
 SG_EXTRA_DIRS = scene sound screen
 METAR_DIRS = environment
@@ -35,6 +35,6 @@ SUBDIRS = \
 	$(SG_EXTRA_DIRS) \
 	$(SGTHREAD_DIR) \
 	serial \
-	timing \
+	timing
 
 DIST_SUBDIRS = $(SUBDIRS) compatibility
diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index d61a6165..ee2294c4 100644
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -30,7 +30,7 @@ tcp_server_SOURCES = tcp_server.cxx
 
 tcp_server_LDADD = \
 	libsgio.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \	
+	$(top_builddir)/simgear/structure/libsgstructure.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \