diff --git a/.emacs.d/core.el b/.emacs.d/core.el
index cd1f550..9d49f40 100644
--- a/.emacs.d/core.el
+++ b/.emacs.d/core.el
@@ -240,6 +240,9 @@
 ;; We're going to stop doing ido and start doing helm, maybe?
 (require 'ido)
 
+;; Cleanup all the whitespaces.
+(add-hook 'before-save-hook 'whitespace-cleanup)
+
 ;; =================================================================
 ;; Text mode configuration.
 ;; =================================================================