Index: Makefile
===================================================================
--- Makefile	(revision feab36ae506549c27d8f55556337394648907d2b)
+++ Makefile	(revision 8ddaaacd4f1ffc7cd429e863b42a92bfe0fbf899)
@@ -41,5 +41,4 @@
 COMMON_MAKEFILE = Makefile.common
 COMMON_HEADER = common.h
-COMMON_HEADER_PREV = $(COMMON_HEADER).prev
 
 CONFIG_MAKEFILE = Makefile.config
@@ -52,5 +51,4 @@
 
 common: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
-	cp -a $(COMMON_HEADER) $(COMMON_HEADER_PREV)
 
 kernel: common
@@ -85,7 +83,7 @@
 # Autotool (detects compiler features)
 
-autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
+autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE) $(AUTOTOOL)
 	$(AUTOTOOL)
-	-[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
+	diff -q $(COMMON_HEADER).new $(COMMON_HEADER) 2> /dev/null; if [ $$? -ne 0 ]; then mv -f $(COMMON_HEADER).new $(COMMON_HEADER); fi
 
 # Build-time configuration
@@ -115,5 +113,5 @@
 
 distclean: clean
-	rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
+	rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
 
 clean: