2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c54a8527e..1631700af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixed #1628 - Changed node search to use certname rather than Facter hostname
+
     Updated puppet binary documentation 
 
     Feature #1624 - Added RBAC roles to solaris user provider
diff --git a/bin/puppet b/bin/puppet
index 142ddd9bb..942902586 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -183,11 +183,12 @@ if Puppet[:parseonly]
 end
 
 # Collect our facts.
-facts = Puppet::Node::Facts.find("me")
-facts.name = facts.values["hostname"]
+facts = Puppet::Node::Facts.find(Puppet[:certname])
 
 # Find our Node
-node = Puppet::Node.find(facts.name)
+unless node = Puppet::Node.find(Puppet[:certname])
+    raise "Could not find node %s" % Puppet[:certname]
+end
 
 # Merge in the facts.
 node.merge(facts.values)