diff --git a/README.md b/README.md
index 24bd88db0..d63b93bcc 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ It's a terminal-based editor first, but I'd like to explore a custom renderer
 
 # Installation
 
-Note: Only the Rust syntax has indentation definitions at the moment.
+Note: Only Rust and Golang have indentation definitions at the moment.
 
 We provide packaging for various distributions, but here's a quick method to
 build from source.
diff --git a/runtime/queries/go/indents.toml b/runtime/queries/go/indents.toml
new file mode 100644
index 000000000..d75ef7ecc
--- /dev/null
+++ b/runtime/queries/go/indents.toml
@@ -0,0 +1,21 @@
+indent = [
+  "import_declaration",
+  "const_declaration",
+  "var_declaration",
+  "function_declaration",
+  "method_declaration",
+  "composite_literal",
+  "func_literal",
+  "literal_value",
+  "expression_case",
+  "default_case",
+  "argument_list",
+  "block"
+]
+
+outdent = [
+ "case",
+ "}",
+ "]",
+ ")"
+]