diff --git a/emacs.el b/emacs.el
index 1532abd..a1d9313 100644
--- a/emacs.el
+++ b/emacs.el
@@ -18,6 +18,7 @@
   (add-to-list 'load-path d))
 
 (eval-when-compile
+  ;; TODO: Use cl-lib intead
   (require 'cl nil t))
 
 
@@ -1190,6 +1191,10 @@ IF OK-IF-ALREADY-EXISTS is true force download."
      (setq auto-mode-alist (append '(("PKGBUILD\\'" . pkgbuild-mode))
                                    auto-mode-alist)))
 
+(and (autoload-eval-lazily 'groovy-mode)
+     (add-to-list 'auto-mode-alist
+                  '("build.gradle\\'" . groovy-mode)))
+
 (add-hook 'yaml-mode-hook
           (lambda ()
             (local-set-key(kbd "C-m") 'newline)))