   `(
 
     ;; Function declarations
-    (,(concat "fun[[:space:]\n]+" futhark-type
+    (,(concat "\\(?:fun\\|entry\\)[[:space:]\n]+" futhark-type
               "[[:space:]\n]+\\(" futhark-var "\\)")
      . '(1 font-lock-function-name-face))
 

            (current-column))

       ;; Align function definitions to column 0.
       (and (futhark-looking-at-word "fun")
            0)

       ;; Align closing parentheses and commas to opening

        (topp (save-excursion (or (ignore-errors
                                    (backward-up-list 1)
                                    (point))
                                  (max
                                   (or (save-excursion
                                         (futhark-find-keyword-backward-raw "fun"))
                                       0)
                                   (or (save-excursion
                                         (futhark-find-keyword-backward-raw "entry"))
                                       0))
                                  )))
        (result nil)
        )

