diff --git a/README.md b/README.md
index 0378941..3d9b79c 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Then, run the following commands:
 git clone https://github.com/pivotal/pivotal_ide_prefs
 cd pivotal_ide_prefs
 cli/bin/ide_prefs install --ide=intellij
-# ide flag can be any of [rubymine,intellij,intellijcommunity,webstorm,androidstudio,appcode,clion,pycharm]
+# ide flag can be any of [rubymine,intellij,intellijcommunity,webstorm,androidstudio,appcode,clion,gogland,pycharm]
 ```
 
 This will install the preferences into your IDE of choice; it will default to installing preferences into the latest version of the IDE installed on your machine; if no IDE is installed on your machine, then it will install into the "default" version configured in pivotal_ide_prefs. If you want to find the default version for your IDE, look in `cli/lib/cli/ide/<IDE>_user_pref_dir.rb`.
@@ -55,7 +55,7 @@ Then open a terminal and run the following commands:
 
 ```sh
 cd /path/to/your/pivotal_ide_prefs/cli
-bin/ide_prefs uninstall --ide=[rubymine,intellij,intellijcommunity,androidstudio,appcode,clion,pycharm]
+bin/ide_prefs uninstall --ide=[rubymine,intellij,intellijcommunity,androidstudio,appcode,clion,gogland,pycharm]
 ```
 
 ## Contributing New Preferences
diff --git a/cli/bin/ide_prefs.rb b/cli/bin/ide_prefs.rb
index f74a744..5154edf 100755
--- a/cli/bin/ide_prefs.rb
+++ b/cli/bin/ide_prefs.rb
@@ -26,8 +26,8 @@
 
   opts.on(
       "--ide=IDE",
-      ["webstorm", "intellij", "intellijcommunity", "rubymine", "appcode", "androidstudio", "clion", "pycharm"],
-      "webstorm, intellij, intellijcommunity, rubymine, appcode, androidstudio", "clion", "pycharm"
+      ["webstorm", "intellij", "intellijcommunity", "rubymine", "appcode", "androidstudio", "clion", "pycharm", "gogland"],
+      "webstorm, intellij, intellijcommunity, rubymine, appcode, androidstudio", "clion", "pycharm", "gogland"
   ) do |ide|
     repo_config_options[:user_prefs_repo_location] = Module.const_get("Cli::Ide::#{ide.capitalize}UserPrefDir").new.path
     repo_config_options[:ide_name] = ide
diff --git a/cli/lib/cli/ide/gogland_user_pref_dir.rb b/cli/lib/cli/ide/gogland_user_pref_dir.rb
new file mode 100644
index 0000000..c0bdc0c
--- /dev/null
+++ b/cli/lib/cli/ide/gogland_user_pref_dir.rb
@@ -0,0 +1,15 @@
+require "cli/ide/jet_brains_ide_user_pref_dir"
+
+module Cli
+  module Ide
+    class GoglandUserPrefDir < JetBrainsIdeUserPrefDir
+      def ide_pref_dir_name_without_version
+        "Gogland"
+      end
+
+      def default_ide_pref_dir_version
+        "1.0"
+      end
+    end
+  end
+end
diff --git a/pref_sources/Gogland/keymaps/Pivotal Common.xml b/pref_sources/Gogland/keymaps/Pivotal Common.xml
new file mode 120000
index 0000000..fae0414
--- /dev/null
+++ b/pref_sources/Gogland/keymaps/Pivotal Common.xml	
@@ -0,0 +1 @@
+../../Jetbrains/keymaps/Pivotal Common.xml
\ No newline at end of file
diff --git a/pref_sources/Gogland/keymaps/Pivotal Gogland.xml b/pref_sources/Gogland/keymaps/Pivotal Gogland.xml
new file mode 100644
index 0000000..c0bf19b
--- /dev/null
+++ b/pref_sources/Gogland/keymaps/Pivotal Gogland.xml	
@@ -0,0 +1 @@
+<keymap version="1" name="Pivotal Gogland" parent="Pivotal Common" />
\ No newline at end of file
diff --git a/pref_sources/Gogland/options/code.style.schemes.xml b/pref_sources/Gogland/options/code.style.schemes.xml
new file mode 100644
index 0000000..5782c6d
--- /dev/null
+++ b/pref_sources/Gogland/options/code.style.schemes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+  <component name="CodeStyleSchemeSettings">
+    <option name="CURRENT_SCHEME_NAME" value="Pivotal" />
+  </component>
+</application>
+
diff --git a/pref_sources/Gogland/options/colors.scheme.xml b/pref_sources/Gogland/options/colors.scheme.xml
new file mode 100644
index 0000000..39308cd
--- /dev/null
+++ b/pref_sources/Gogland/options/colors.scheme.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="EditorColorsManagerImpl">
+    <global_color_scheme name="Darcula" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/pref_sources/Gogland/options/editor.xml b/pref_sources/Gogland/options/editor.xml
new file mode 100644
index 0000000..b5eda56
--- /dev/null
+++ b/pref_sources/Gogland/options/editor.xml
@@ -0,0 +1,10 @@
+<application>
+  <component name="EditorSettings">
+    <option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" />
+    <option name="IS_DND_ENABLED" value="false" />
+  </component>
+  <component name="SqlEditorOptions">
+    <option name="concatenateStringsOnEnter" value="true" />
+    <option name="qualificationType" value="On collisions" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/pref_sources/Gogland/options/ide.general.xml b/pref_sources/Gogland/options/ide.general.xml
new file mode 100644
index 0000000..e28ca5d
--- /dev/null
+++ b/pref_sources/Gogland/options/ide.general.xml
@@ -0,0 +1,9 @@
+<application>
+  <component name="GeneralSettings">
+    <option name="confirmExit" value="false" />
+    <option name="showTipsOnStartup" value="false" />
+  </component>
+  <component name="Registry">
+    <entry key="ide.firstStartup" value="false" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/pref_sources/Gogland/options/keymap.xml b/pref_sources/Gogland/options/keymap.xml
new file mode 100644
index 0000000..0a6cb59
--- /dev/null
+++ b/pref_sources/Gogland/options/keymap.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+  <component name="KeymapManager">
+    <active_keymap name="Pivotal Gogland" />
+  </component>
+</application>
+
diff --git a/pref_sources/Gogland/templates/ginkgo.xml b/pref_sources/Gogland/templates/ginkgo.xml
new file mode 100644
index 0000000..b71b7f2
--- /dev/null
+++ b/pref_sources/Gogland/templates/ginkgo.xml
@@ -0,0 +1,16 @@
+<templateSet group="ginkgo">
+  <template name="Cont" value="Context(&quot;$1$&quot;, func() {&#10;  $END$&#10;})" description="Ginkgo Context" toReformat="true" toShortenFQNames="true">
+    <variable name="1" expression="" defaultValue="" alwaysStopAt="true" />
+  </template>
+  <template name="It" value="It(&quot;$1$&quot;, func() {&#10;  $END$&#10;})" description="Ginkgo it definition" toReformat="true" toShortenFQNames="true">
+    <variable name="1" expression="" defaultValue="" alwaysStopAt="true" />
+  </template>
+  <template name="Desc" value="Describe(&quot;$1$&quot;, func() {&#10;  $END$&#10;})" description="Ginkgo Describe" toReformat="true" toShortenFQNames="true">
+    <variable name="1" expression="" defaultValue="" alwaysStopAt="true" />
+  </template>
+  <template name="Bef" value="BeforeEach(func() {&#10;  $END$&#10;})" description="Ginkgo BeforeEach" toReformat="true" toShortenFQNames="true" />
+  <template name="Aft" value="AfterEach(func() {&#10;  $END$&#10;})" description="Ginkgo AfterEach" toReformat="true" toShortenFQNames="true" />
+  <template name="f" value="func($START$) {&#10;    $END$&#10;}" description="anonymous function" toReformat="true" toShortenFQNames="true">
+    <variable name="START" expression="" defaultValue="" alwaysStopAt="true" />
+  </template>
+</templateSet>
\ No newline at end of file