diff --git a/lib/puppet/feature/rubygems.rb b/lib/puppet/feature/rubygems.rb
new file mode 100644
index 000000000..639524ffe
--- /dev/null
+++ b/lib/puppet/feature/rubygems.rb
@@ -0,0 +1,6 @@
+#  Created by Luke Kanies on 2006-11-07.
+#  Copyright (c) 2006. All rights reserved.
+
+require 'puppet/util/feature'
+
+Puppet.features.add(:rubygems, :libs => "rubygems")
diff --git a/lib/puppet/feature/stomp.rb b/lib/puppet/feature/stomp.rb
new file mode 100644
index 000000000..4a77c0a25
--- /dev/null
+++ b/lib/puppet/feature/stomp.rb
@@ -0,0 +1,6 @@
+require 'puppet/util/feature'
+
+# We want this to load if possible, but it's not automatically
+# required.
+Puppet.features.rubygems?
+Puppet.features.add(:stomp, :libs => %{stomp})