diff --git a/CHANGELOG.md b/CHANGELOG.md
index 446370e..8c472d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Change Log
 
-### 2.3.4, 2.3.5
+### 2.3.7
+* Fix issue with Rails integration
+
+### 2.3.4, 2.3.6
 * Fix compatibility issues with Libsass
 * Refactor and get rid of various functions
 
diff --git a/bower.json b/bower.json
index bffca7e..5e07a6b 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "flint",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "main": "stylesheets/_flint.scss",
   "description": "Flint is a highly advanced Sass grid framework designed for rapid responsive development.",
   "authors": ["Ezekiel Gabrielse <ezekg@yahoo.com>"],
diff --git a/lib/flint-gs.rb b/lib/flint-gs.rb
new file mode 100644
index 0000000..2ddc4f1
--- /dev/null
+++ b/lib/flint-gs.rb
@@ -0,0 +1,8 @@
+# encoding: UTF-8
+
+lib = File.expand_path "../../lib/", __FILE__
+$:.unshift lib unless $:.include? lib
+
+# FIXME: Fixes an issue with Rails integration due to the gem being named
+#        `flint-gs`, but the lib being named `flint` (issue #37)
+require "flint"
diff --git a/lib/flint/version.rb b/lib/flint/version.rb
index c40ce4c..7666e99 100644
--- a/lib/flint/version.rb
+++ b/lib/flint/version.rb
@@ -1,3 +1,3 @@
 module Flint
-  VERSION = "2.3.6"
+  VERSION = "2.3.7"
 end