diff --git a/runtime/ftplugin/gleam.vim b/runtime/ftplugin/gleam.vim
index 9ed607c..5187d4d 100644
--- a/runtime/ftplugin/gleam.vim
+++ b/runtime/ftplugin/gleam.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
-" Language:    Gleam
-" Maintainer:  Trilowy (https://github.com/trilowy)
-" Last Change: 2024 Oct 13
+" Language:            Gleam
+" Maintainer:          Kirill Morozov <kirill@robotix.pro>
+" Previous Maintainer: Trilowy (https://github.com/trilowy)
+" Last Change:         2025-04-12
 
 if exists('b:did_ftplugin')
   finish
@@ -10,7 +11,11 @@
 
 setlocal comments=://,:///,:////
 setlocal commentstring=//\ %s
+setlocal expandtab
+setlocal formatprg=gleam\ format\ --stdin
+setlocal shiftwidth=2
+setlocal softtabstop=2
 
-let b:undo_ftplugin = "setlocal comments< commentstring<"
+let b:undo_ftplugin = "setlocal com< cms< fp< et< sw< sts<"
 
 " vim: sw=2 sts=2 et