diff --git a/lib/puppet/provider/package/pacman.rb b/lib/puppet/provider/package/pacman.rb
index 4fd71ffe3..0c721c9d4 100644
--- a/lib/puppet/provider/package/pacman.rb
+++ b/lib/puppet/provider/package/pacman.rb
@@ -1,201 +1,209 @@
 require 'puppet/provider/package'
 require 'set'
 require 'uri'
 
 Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Package do
   desc "Support for the Package Manager Utility (pacman) used in Archlinux."
 
   commands :pacman => "/usr/bin/pacman"
   # Yaourt is a common AUR helper which, if installed, we can use to query the AUR
   commands :yaourt => "/usr/bin/yaourt" if Puppet::FileSystem.exist? '/usr/bin/yaourt'
 
   confine     :operatingsystem => :archlinux
   defaultfor  :operatingsystem => :archlinux
   has_feature :upgradeable
 
   # If yaourt is installed, we can make use of it
   def yaourt?
     return Puppet::FileSystem.exist?('/usr/bin/yaourt')
   end
 
   # Install a package using 'pacman', or 'yaourt' if available.
   # Installs quietly, without confirmation or progressbar, updates package
   # list from servers defined in pacman.conf.
   def install
     if @resource[:source]
       install_from_file
     else
       install_from_repo
     end
 
     unless self.query
       raise Puppet::ExecutionFailure.new("Could not find package %s" % self.name)
     end
   end
 
   def install_from_repo
     if yaourt?
       yaourt "--noconfirm", "-S", @resource[:name]
     else
         pacman "--noconfirm", "--noprogressbar", "-Sy", @resource[:name]
     end
   end
   private :install_from_repo
 
   def install_from_file
     source = @resource[:source]
     begin
       source_uri = URI.parse source
     rescue => detail
       self.fail Puppet::Error, "Invalid source '#{source}': #{detail}", detail
     end
 
     source = case source_uri.scheme
     when nil then source
     when /https?/i then source
     when /ftp/i then source
     when /file/i then source_uri.path
     when /puppet/i
       fail "puppet:// URL is not supported by pacman"
     else
       fail "Source #{source} is not supported by pacman"
     end
     pacman "--noconfirm", "--noprogressbar", "-Sy"
     pacman "--noconfirm", "--noprogressbar", "-U", source
   end
   private :install_from_file
 
   def self.listcmd
     [command(:pacman), "-Q"]
   end
 
   # Pacman has a concept of package groups as well.
   # Package groups have no versions.
   def self.listgroupcmd
     [command(:pacman), "-Qg"]
   end
 
   # Get installed packages (pacman -Q)
   def self.installedpkgs
     packages = []
     begin
       execpipe(listcmd()) do |process|
         # pacman -Q output is 'packagename version-rel'
         regex = %r{^(\S+)\s(\S+)}
         fields = [:name, :ensure]
         hash = {}
 
         process.each_line { |line|
           if match = regex.match(line)
             fields.zip(match.captures) { |field,value|
               hash[field] = value
             }
 
             hash[:provider] = self.name
 
             packages << new(hash)
 
             hash = {}
           else
             warning("Failed to match line %s" % line)
           end
         }
       end
     rescue Puppet::ExecutionFailure
       return nil
     end
     packages
   end
 
   # Get installed groups (pacman -Qg)
   def self.installedgroups
     packages = []
     begin
       execpipe(listgroupcmd()) do |process|
         # pacman -Qg output is 'groupname packagename'
         # Groups need to be deduplicated
         groups = Set[]
 
         process.each_line { |line|
           groups.add(line.split[0])
         }
 
         groups.each { |line|
           hash = {
             :name   => line,
             :ensure => "1", # Groups don't have versions, so ensure => latest
                             # will still cause a reinstall.
             :provider => self.name
           }
           packages << new(hash)
         }
       end
     rescue Puppet::ExecutionFailure
       return nil
     end
     packages
   end
 
   # Fetch the list of packages currently installed on the system.
   def self.instances
     packages = self.installedpkgs
-    packages.concat(self.installedgroups)
-    packages
+    groups   = self.installedgroups
+    result   = nil
+
+    if (!packages && !groups)
+      nil
+    elsif (packages && groups)
+      packages.concat(groups)
+    else
+      packages
+    end
   end
 
 
   # Because Archlinux is a rolling release based distro, installing a package
   # should always result in the newest release.
   def update
     # Install in pacman can be used for update, too
     self.install
   end
 
   # We rescue the main check from Pacman with a check on the AUR using yaourt, if installed
   def latest
     pacman "-Sy"
     pacman_check = true   # Query the main repos first
     begin
       if pacman_check
         output = pacman "-Sp", "--print-format", "%v", @resource[:name]
         return output.chomp
       else
         output = yaourt "-Qma", @resource[:name]
         output.split("\n").each do |line|
           return line.split[1].chomp if line =~ /^aur/
         end
       end
     rescue Puppet::ExecutionFailure
       if pacman_check and self.yaourt?
         pacman_check = false # now try the AUR
         retry
       else
         raise
       end
     end
   end
 
   # Querys the pacman master list for information about the package.
   def query
     begin
       output = pacman("-Qi", @resource[:name])
 
       if output =~ /Version.*:\s(.+)/
         return { :ensure => $1 }
       end
     rescue Puppet::ExecutionFailure
       return {
         :ensure => :purged,
         :status => 'missing',
         :name => @resource[:name],
         :error => 'ok',
       }
     end
     nil
   end
 
   # Removes a package from the system.
   def uninstall
     pacman "--noconfirm", "--noprogressbar", "-R", @resource[:name]
   end
 end
diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index 07d114355..789fd88fb 100755
--- a/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
@@ -1,275 +1,295 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 require 'stringio'
 
 provider = Puppet::Type.type(:package).provider(:pacman)
 
 describe provider do
   let(:no_extra_options) { { :failonfail => true, :combine => true, :custom_environment => {} } }
   let(:executor) { Puppet::Util::Execution }
   let(:resolver) { Puppet::Util }
 
   before do
     resolver.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
     provider.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
     resolver.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
     provider.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
     @resource = Puppet::Type.type(:package).new(:name => 'package')
     @provider = provider.new(@resource)
   end
 
   describe "when installing" do
     before do
       @provider.stubs(:query).returns({
         :ensure => '1.0'
       })
     end
 
     it "should call pacman to install the right package quietly" do
 
       if @provider.yaourt?
         args = ['/usr/bin/yaourt', '--noconfirm', '-S', @resource[:name]]
       else
         args = ['/usr/bin/pacman', '--noconfirm', '--noprogressbar', '-Sy', @resource[:name]]
       end
 
       executor.
         expects(:execute).
         at_least_once.
         with(args, no_extra_options).
         returns ''
 
       @provider.install
     end
 
     it "should raise an ExecutionFailure if the installation failed" do
       executor.stubs(:execute).returns("")
       @provider.expects(:query).returns(nil)
 
       lambda { @provider.install }.should raise_exception(Puppet::ExecutionFailure)
     end
 
     context "when :source is specified" do
       before :each do
         @install = sequence("install")
       end
 
       context "recognizable by pacman" do
         %w{
           /some/package/file
           http://some.package.in/the/air
           ftp://some.package.in/the/air
         }.each do |source|
           it "should install #{source} directly" do
             @resource[:source] = source
 
             executor.expects(:execute).
               with(all_of(includes("-Sy"), includes("--noprogressbar")), no_extra_options).
               in_sequence(@install).
               returns("")
 
             executor.expects(:execute).
               with(all_of(includes("-U"), includes(source)), no_extra_options).
               in_sequence(@install).
               returns("")
 
             @provider.install
           end
         end
       end
 
       context "as a file:// URL" do
         before do
           @package_file = "file:///some/package/file"
           @actual_file_path = "/some/package/file"
           @resource[:source] = @package_file
         end
 
         it "should install from the path segment of the URL" do
           executor.expects(:execute).
             with(all_of(includes("-Sy"),
                         includes("--noprogressbar"),
                         includes("--noconfirm")),
                  no_extra_options).
             in_sequence(@install).
             returns("")
 
           executor.expects(:execute).
             with(all_of(includes("-U"), includes(@actual_file_path)), no_extra_options).
             in_sequence(@install).
             returns("")
 
           @provider.install
         end
       end
 
       context "as a puppet URL" do
         before do
           @resource[:source] = "puppet://server/whatever"
         end
 
         it "should fail" do
           lambda { @provider.install }.should raise_error(Puppet::Error)
         end
       end
 
       context "as a malformed URL" do
         before do
           @resource[:source] = "blah://"
         end
 
         it "should fail" do
           lambda { @provider.install }.should raise_error(Puppet::Error)
         end
       end
     end
   end
 
   describe "when updating" do
     it "should call install" do
       @provider.expects(:install).returns("install return value")
       @provider.update.should == "install return value"
     end
   end
 
   describe "when uninstalling" do
     it "should call pacman to remove the right package quietly" do
       executor.
         expects(:execute).
         with(["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", @resource[:name]], no_extra_options).
         returns ""
 
       @provider.uninstall
     end
   end
 
   describe "when querying" do
     it "should query pacman" do
       executor.
         expects(:execute).
         with(["/usr/bin/pacman", "-Qi", @resource[:name]], no_extra_options)
       @provider.query
     end
 
     it "should return the version" do
       query_output = <<EOF
 Name           : package
 Version        : 1.01.3-2
 URL            : http://www.archlinux.org/pacman/
 Licenses       : GPL
 Groups         : base
 Provides       : None
 Depends On     : bash  libarchive>=2.7.1  libfetch>=2.25  pacman-mirrorlist
 Optional Deps  : fakeroot: for makepkg usage as normal user
                  curl: for rankmirrors usage
 Required By    : None
 Conflicts With : None
 Replaces       : None
 Installed Size : 2352.00 K
 Packager       : Dan McGee <dan@archlinux.org>
 Architecture   : i686
 Build Date     : Sat 22 Jan 2011 03:56:41 PM EST
 Install Date   : Thu 27 Jan 2011 06:45:49 AM EST
 Install Reason : Explicitly installed
 Install Script : Yes
 Description    : A library-based package manager with dependency support
 EOF
 
       executor.expects(:execute).returns(query_output)
       @provider.query.should == {:ensure => "1.01.3-2"}
     end
 
     it "should return a nil if the package isn't found" do
       executor.expects(:execute).returns("")
       @provider.query.should be_nil
     end
 
     it "should return a hash indicating that the package is missing on error" do
       executor.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
       @provider.query.should == {
         :ensure => :purged,
         :status => 'missing',
         :name => @resource[:name],
         :error => 'ok',
       }
     end
   end
 
+
+
   describe "when fetching a package list" do
-    it "should query pacman" do
+    it "should retrieve installed packages" do
       provider.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
-      provider.instances
+      provider.installedpkgs
+    end
+
+    it "should retrieve installed package groups" do
+      provider.expects(:execpipe).with(["/usr/bin/pacman", '-Qg'])
+      provider.installedgroups
     end
 
     it "should return installed packages with their versions" do
       provider.expects(:execpipe).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
-      packages = provider.instances
+      packages = provider.installedpkgs
 
       packages.length.should == 2
 
       packages[0].properties.should == {
         :provider => :pacman,
         :ensure => '1.23-4',
         :name => 'package1'
       }
 
       packages[1].properties.should == {
         :provider => :pacman,
         :ensure => '2.00',
         :name => 'package2'
       }
     end
 
+    it "should return installed groups with a dummy version" do
+      provider.expects(:execpipe).yields(StringIO.new("group1 pkg1\ngroup1 pkg2"))
+      groups = provider.installedgroups
+
+      groups.length.should == 1
+
+      groups[0].properties.should == {
+        :provider => :pacman,
+        :ensure   => '1',
+        :name     => 'group1'
+      }
+    end
+
     it "should return nil on error" do
-      provider.expects(:execpipe).raises(Puppet::ExecutionFailure.new("ERROR!"))
+      provider.expects(:execpipe).twice.raises(Puppet::ExecutionFailure.new("ERROR!"))
       provider.instances.should be_nil
     end
 
     it "should warn on invalid input" do
       provider.expects(:execpipe).yields(StringIO.new("blah"))
       provider.expects(:warning).with("Failed to match line blah")
-      provider.instances.should == []
+      provider.installedpkgs == []
     end
   end
 
   describe "when determining the latest version" do
     it "should refresh package list" do
       get_latest_version = sequence("get_latest_version")
       executor.
         expects(:execute).
         in_sequence(get_latest_version).
         with(['/usr/bin/pacman', '-Sy'], no_extra_options)
 
       executor.
         stubs(:execute).
         in_sequence(get_latest_version).
         returns("")
 
       @provider.latest
     end
 
     it "should get query pacman for the latest version" do
       get_latest_version = sequence("get_latest_version")
       executor.
         stubs(:execute).
         in_sequence(get_latest_version)
 
       executor.
         expects(:execute).
         in_sequence(get_latest_version).
         with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', @resource[:name]], no_extra_options).
         returns("")
 
       @provider.latest
     end
 
     it "should return the version number from pacman" do
       executor.
         expects(:execute).
         at_least_once().
         returns("1.00.2-3\n")
 
       @provider.latest.should == "1.00.2-3"
     end
   end
 end