diff --git a/Makefile b/Makefile
index 7fabbe0..840f6fd 100644
--- a/Makefile
+++ b/Makefile
@@ -15,5 +15,5 @@ all:
 clean:
 	$(MAKE) -C lib clean
 	$(MAKE) -C tests clean
-        $(RM) *~
+	$(RM) *~
 
diff --git a/lib/Makefile b/lib/Makefile
index 1f2894c..017484f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -21,14 +21,7 @@ OBJS =	utils.o \
 all:	$(OBJS)
 
 clean:
-       $(RM) *.o *~
-       $(RM) test_aes
-       $(RM) test_cbc_mode
-       $(RM) test_ctr_mode
-       $(RM) test_hmac
-       $(RM) test_hmac_prng
-       $(RM) test_sha256
-
+	$(RM) *.o *.gch core *dump *~
 
 # Dependencies
 aes_decrypt.o:		aes_decrypt.c aes.h utils.o 
diff --git a/tests/Makefile b/tests/Makefile
index 4dc96f1..954f0ef 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -16,6 +16,15 @@ all:	test_aes \
 	test_hmac_prng \
 	test_sha256 
 
+clean:
+	$(RM) *.o *~
+	$(RM) test_aes
+	$(RM) test_cbc_mode
+	$(RM) test_ctr_mode
+	$(RM) test_hmac
+	$(RM) test_hmac_prng
+	$(RM) test_sha256
+	$(RM) ../lib/*.o *~
 
 # Dependencies
 test_aes:		test_aes.o ../lib/aes_encrypt.o \