diff --git a/init.el b/init.el
index 8e4e1de..27dd02a 100644
--- a/init.el
+++ b/init.el
@@ -43,8 +43,13 @@
 (scroll-bar-mode -1)
 (global-hl-line-mode 1)
 
+(defun hgh/untabify-buffer ()
+  (interactive)
+  (untabify (region-beginning) (region-end) nil))
+
 (add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
+(add-hook 'before-save-hook 'hgh/untabify-buffer)
 
 (if (file-exists-p custom-file)
     (load-file custom-file))