diff --git a/ChangeLog b/ChangeLog
index 85cd38998..d06da3445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Features
    * Added support for SSL_EDH_RSA_AES_128_SHA and
      SSL_EDH_RSA_CAMELLIA_128_SHA ciphersuites
 
+Changes
+   * Made Makefile cleaner
+
 = Version 0.13.1 released on 2010-03-24
 Bug fixes
    * Fixed Makefile in library that was mistakenly merged
diff --git a/Makefile b/Makefile
index 5c7bc7b5a..6313bbc67 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,9 @@ PREFIX=polarssl_
 .SILENT:
 
 all:
-	cd library  && make all && cd ..
-	cd programs && make all && cd ..
-	cd tests && make all && cd ..
+	cd library  && $(MAKE) all && cd ..
+	cd programs && $(MAKE) all && cd ..
+	cd tests && $(MAKE) all && cd ..
 
 install:
 	mkdir -p $(DESTDIR)/include/polarssl
@@ -26,9 +26,9 @@ install:
 	done
 
 clean:
-	cd library  && make clean && cd ..
-	cd programs && make clean && cd ..
-	cd tests && make clean && cd ..
+	cd library  && $(MAKE) clean && cd ..
+	cd programs && $(MAKE) clean && cd ..
+	cd tests && $(MAKE) clean && cd ..
 
 check:
-	( cd tests && make check )
+	( cd tests && $(MAKE) check )