diff --git a/.dir-locals.el b/.dir-locals.el
index dc202fea6..067d9d53f 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,6 +3,7 @@
 
 ((c-mode . (((c-basic-offset . 4) . ((c-offsets-alist
                                       (arglist-intro . 4))))))
- (f90-mode . (((f90-if-indent . 2) . ((f90-do-indent . 2)
-                                      (f90-type-indent . 2)))))
+ (f90-mode . ((f90-type-indent . 2)
+              (f90-do-indent . 2)
+              (f90-if-indent . 2)))
  (sh-mode . ((sh-basic-offset . 4))))
diff --git a/scripts/indent.sh b/scripts/indent.sh
index 8b375f0e1..49b5b79aa 100755
--- a/scripts/indent.sh
+++ b/scripts/indent.sh
@@ -43,9 +43,6 @@ done
 for f in "${FORTRAN_FILES[@]}"; do
   ${EMACS} --batch \
     "${f}" \
-    --eval "(setq f90-do-indent 2)" \
-    --eval "(setq f90-if-indent 2)" \
-    --eval "(setq f90-type-indent 2)" \
     --eval "(whitespace-cleanup)" \
     --eval "(indent-region (minibuffer-prompt-end) (point-max) nil)" \
     -f save-buffer