diff --git a/Makefile.am b/Makefile.am
index e1ad48666e9ed08403e621975692e0c678aec617..1ca30d0cda041175a39ef91885b03d24bd21da6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -143,7 +143,7 @@ CLEANFILES = \
 	$(all_dirfiles) \
 	$(PYTHON_BOOTSTRAP) \
 	epydoc.conf \
-	autotools/replace_vars.sed \
+	$(REPLACE_VARS_SED) \
 	daemons/daemon-util \
 	daemons/ganeti-cleaner \
 	devel/upload \
@@ -163,7 +163,7 @@ CLEANFILES = \
 # BUILT_SOURCES should only be used as a dependency on phony
 # targets. Otherwise it'll cause the target to rebuild every time.
 BUILT_SOURCES = \
-  $(built_base_sources) \
+	$(built_base_sources) \
 	$(BUILT_PYTHON_SOURCES) \
 	$(PYTHON_BOOTSTRAP)
 
@@ -180,8 +180,8 @@ BUILT_PYTHON_SOURCES = \
 	$(built_python_base_sources) \
 	lib/_generated_rpc.py
 
-# Generating the RPC wrappers depends on many things, so make sure it's built at
-# the end of the built sources
+# Generating the RPC wrappers depends on many things, so make sure
+# it's built at the end of the built sources
 lib/_generated_rpc.py: | $(built_base_sources) $(built_python_base_sources)
 
 # these are all built from the underlying %.in sources