diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb
index 393ae56c9..8c7b24bd4 100644
--- a/lib/puppet/provider/mount.rb
+++ b/lib/puppet/provider/mount.rb
@@ -1,51 +1,51 @@
 #  Created by Luke Kanies on 2006-11-12.
 #  Copyright (c) 2006. All rights reserved.
 
 require 'puppet'
 
 # A module just to store the mount/unmount methods.  Individual providers
 # still need to add the mount commands manually.
 module Puppet::Provider::Mount
   # This only works when the mount point is synced to the fstab.
   def mount
     # Manually pass the mount options in, since some OSes *cough*OS X*cough* don't
     # read from /etc/fstab but still want to use this type.
     args = []
     args << "-o" << self.options if self.options and self.options != :absent
     args << resource[:name]
 
     flush if respond_to?(:flush)
     mountcmd(*args)
   end
 
   def remount
     info "Remounting"
     if resource[:remounts] == :true
       mountcmd "-o", "remount", resource[:name]
     else
       unmount
       mount
     end
   end
 
   # This only works when the mount point is synced to the fstab.
   def unmount
     umount resource[:name]
   end
 
   # Is the mount currently mounted?
   def mounted?
     platform = Facter.value("operatingsystem")
     name = resource[:name]
     mounts = mountcmd.split("\n").find do |line|
       case platform
       when "Darwin"
         line =~ / on #{name} / or line =~ %r{ on /private/var/automount#{name}}
-      when "Solaris"
+      when "Solaris", "HP-UX"
         line =~ /^#{name} on /
       else
         line =~ / on #{name} /
       end
     end
   end
 end
diff --git a/spec/unit/provider/mount_spec.rb b/spec/unit/provider/mount_spec.rb
index 55a52b44a..b034214ee 100755
--- a/spec/unit/provider/mount_spec.rb
+++ b/spec/unit/provider/mount_spec.rb
@@ -1,130 +1,137 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/provider/mount'
 
 describe Puppet::Provider::Mount do
   before :each do
     @mounter = Object.new
     @mounter.extend(Puppet::Provider::Mount)
 
     @name = "/"
 
     @resource = stub 'resource'
     @resource.stubs(:[]).with(:name).returns(@name)
 
     @mounter.stubs(:resource).returns(@resource)
   end
 
   describe Puppet::Provider::Mount, " when mounting" do
 
     it "should use the 'mountcmd' method to mount" do
       @mounter.stubs(:options).returns(nil)
       @mounter.expects(:mountcmd)
 
       @mounter.mount
     end
 
     it "should flush before mounting if a flush method exists" do
       @mounter.meta_def(:flush) { }
       @mounter.expects(:flush)
       @mounter.stubs(:mountcmd)
       @mounter.stubs(:options).returns(nil)
 
       @mounter.mount
     end
 
     it "should add the options following '-o' if they exist and are not set to :absent" do
       @mounter.stubs(:options).returns("ro")
       @mounter.expects(:mountcmd).with { |*ary| ary[0] == "-o" and ary[1] == "ro" }
 
       @mounter.mount
     end
 
     it "should specify the filesystem name to the mount command" do
       @mounter.stubs(:options).returns(nil)
       @mounter.expects(:mountcmd).with { |*ary| ary[-1] == @name }
 
       @mounter.mount
     end
   end
 
   describe Puppet::Provider::Mount, " when remounting" do
 
     it "should use '-o remount' if the resource specifies it supports remounting" do
       @mounter.stubs(:info)
       @resource.stubs(:[]).with(:remounts).returns(:true)
       @mounter.expects(:mountcmd).with("-o", "remount", @name)
       @mounter.remount
     end
 
     it "should unmount and mount if the resource does not specify it supports remounting" do
       @mounter.stubs(:info)
       @resource.stubs(:[]).with(:remounts).returns(false)
       @mounter.expects(:unmount)
       @mounter.expects(:mount)
       @mounter.remount
     end
 
     it "should log that it is remounting" do
       @resource.stubs(:[]).with(:remounts).returns(:true)
       @mounter.stubs(:mountcmd)
       @mounter.expects(:info).with("Remounting")
       @mounter.remount
     end
   end
 
   describe Puppet::Provider::Mount, " when unmounting" do
 
     it "should call the :umount command with the resource name" do
       @mounter.expects(:umount).with(@name)
       @mounter.unmount
     end
   end
 
   describe Puppet::Provider::Mount, " when determining if it is mounted" do
 
     it "should parse the results of running the mount command with no arguments" do
       Facter.stubs(:value).returns("whatever")
       @mounter.expects(:mountcmd).returns("")
 
       @mounter.mounted?
     end
 
     it "should match ' on /private/var/automount<name>' if the operating system is Darwin" do
       Facter.stubs(:value).with("operatingsystem").returns("Darwin")
       @mounter.expects(:mountcmd).returns("/dev/whatever on /private/var/automount/\ndevfs on /dev")
 
       @mounter.should be_mounted
     end
 
     it "should match ' on <name>' if the operating system is Darwin" do
       Facter.stubs(:value).with("operatingsystem").returns("Darwin")
       @mounter.expects(:mountcmd).returns("/dev/disk03 on / (local, journaled)\ndevfs on /dev")
 
       @mounter.should be_mounted
     end
 
     it "should match '^<name> on' if the operating system is Solaris" do
       Facter.stubs(:value).with("operatingsystem").returns("Solaris")
       @mounter.expects(:mountcmd).returns("/ on /dev/dsk/whatever\n/var on /dev/dsk/other")
 
       @mounter.should be_mounted
     end
 
-    it "should match ' on <name>' if the operating system is not Darwin or Solaris" do
+    it "should match '^<name> on' if the operating system is HP-UX" do
+      Facter.stubs(:value).with("operatingsystem").returns("HP-UX")
+      @mounter.expects(:mountcmd).returns("/ on /dev/dsk/whatever\n/var on /dev/dsk/other")
+
+      @mounter.should be_mounted
+    end
+
+    it "should match ' on <name>' if the operating system is not Darwin, Solaris, or HP-UX" do
       Facter.stubs(:value).with("operatingsystem").returns("Debian")
       @mounter.expects(:mountcmd).returns("/dev/dsk/whatever on / and stuff\n/dev/other/disk on /var and stuff")
 
       @mounter.should be_mounted
     end
 
     it "should not be considered mounted if it did not match the mount output" do
       Facter.stubs(:value).with("operatingsystem").returns("Debian")
       @mounter.expects(:mountcmd).returns("/dev/dsk/whatever on /something/else and stuff\n/dev/other/disk on /var and stuff")
 
       @mounter.should_not be_mounted
     end
   end
 end