diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index 5aba63a..4daf671 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -37,6 +37,14 @@
                 company-minimum-prefix-length 1
                 whitespace-style (delete 'indentation whitespace-style))
 
+    ;; Enable manually formatting with golines by executing M-x gofmt
+    (let ((golines (executable-find "golines"))
+          (gofumports (executable-find "gofumports")))
+      (when golines
+        (setq gofmt-command golines)
+        (setq gofmt-args '("-t" "4" "-m" "80" "--no-reformat-tags"))
+        (when gofumports
+          (add-to-list 'gofmt-args "--base-formatter=gofumports"))))
 
     (when (fboundp 'highlight-symbol-mode)
       (highlight-symbol-mode -1))