diff --git a/Gemfile.lock b/Gemfile.lock
index 1a871fb9c35b170153f2bcf6333fd3a74fd19ba8..f9d6ba039ff1b3ee3f3c5a848535027341021baf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     diff-lcs (1.2.5)
     json (1.8.3)
-    pg_query (0.5.0)
+    pg_query (0.9.1)
       json (~> 1.8)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
@@ -27,4 +27,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.3
+   1.11.2
diff --git a/lib/sqlint/linter.rb b/lib/sqlint/linter.rb
index 848cf6d3825e45bb4e5f6024e1cf858a906115f0..8b94c39f3d39b42116cde9b0a7ac8dce5dd070b4 100644
--- a/lib/sqlint/linter.rb
+++ b/lib/sqlint/linter.rb
@@ -56,7 +56,9 @@ module SQLint
     end
 
     def clean_message(message)
-      message.gsub(/(?<=at or near ")(.*)(?=")/) { |match| match[0..49] }
+      message
+      .gsub(/(?<=at or near ")(.*)(?=")/) { |match| match[0..49] }
+      .gsub(/\s+\(scan\.l\:\d+\)/, '')
     end
   end
 end
diff --git a/sqlint.gemspec b/sqlint.gemspec
index 08e9f4ef3a8d8cf38dbdc9d2aa240bd8e4152fed..4b18e38f56472a9b1e3d4799a2bb97057aa23d50 100644
--- a/sqlint.gemspec
+++ b/sqlint.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.8.23'
   s.summary = 'Simple SQL linter.'
 
-  s.add_runtime_dependency('pg_query', '~> 0.5')
+  s.add_runtime_dependency('pg_query', '~> 0.9.1')
   s.add_development_dependency('rake', '~> 10.1')
   s.add_development_dependency('rspec', '~> 3.2')
   s.add_development_dependency('bundler', '~> 1.3')