diff --git a/discovery/puppetdb.ddl b/discovery/puppetdb.ddl
index 0579cbc..26c8a01 100644
--- a/discovery/puppetdb.ddl
+++ b/discovery/puppetdb.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "puppetdb discovery",
             :description => "PuppetDB based discovery",
             :author      => "Pieter Loubser <ploubser@gmail.com>",
             :license     => "ASL 2.0",
-            :version     => "0.3",
+            :version     => "0.3.2",
             :url         => "http://marionette-collective.org/",
             :timeout     => 0
 
diff --git a/util/puppetdb_discovery.rb b/util/puppetdb_discovery.rb
index 4efa9af..41fd4b2 100644
--- a/util/puppetdb_discovery.rb
+++ b/util/puppetdb_discovery.rb
@@ -145,7 +145,12 @@ def make_request(endpoint, query)
       end
 
       def make_request_normal(endpoint, query)
-        request = Net::HTTP::Get.new("/v#{@config[:api_version]}/%s" % endpoint, {'accept' => 'application/json'})
+        if @config[:api_version] >= '4'
+          request = Net::HTTP::Get.new("/pdb/query/v#{@config[:api_version]}/%s" % endpoint, {'accept' => 'application/json'})
+        else
+          request = Net::HTTP::Get.new("/v#{@config[:api_version]}/%s" % endpoint, {'accept' => 'application/json'})
+        end
+
         request.set_form_data({"query" => query}) if query
         resp, data = @http.request(request)
         data = resp.body if data.nil?
@@ -156,7 +161,12 @@ def make_request_normal(endpoint, query)
       # With HTTPI and curb for Kerberos support 
       def make_request_krb(endpoint, query)
         require 'cgi'
-        @http.url = "https://#{@config[:host]}:#{@config[:port]}/v#{@config[:api_version]}/#{endpoint}" + (query ? "?query=#{CGI.escape(query)}" : '')
+        if @config[:api_version] >= '4'
+          @http.url = "https://#{@config[:host]}:#{@config[:port]}/pdb/query/v#{@config[:api_version]}/#{endpoint}" + (query ? "?query=#{CGI.escape(query)}" : '')
+        else
+          @http.url = "https://#{@config[:host]}:#{@config[:port]}/v#{@config[:api_version]}/#{endpoint}" + (query ? "?query=#{CGI.escape(query)}" : '')
+        end
+
         resp = HTTPI.get(@http)
         raise 'Failed to make request to PuppetDB: code %s' % [resp.code] if resp.error?
         resp.raw_body