diff --git a/Makefile b/Makefile
index 6e64d5e3fc3ec25c1cb19e47e107da3a54094759..0fa9d42dc045b4edec9336268e2a63c1a08dc3b1 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,9 @@ valgrind_check: all $(PROGRAMS) $(TESTS)
 	done
 
 clean:
-	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) $(THRIFTSERVER) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk */*.d */*/*.d
+	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) $(THRIFTSERVER) build_config.mk
 	-rm -rf ios-x86/* ios-arm/*
+	-for x in `find . -name "*.[od]"`; do rm $$x; done
 
 $(LIBRARY): $(LIBOBJECTS)
 	rm -f $@