diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb
index 1e59fc47d..91a3e0244 100644
--- a/lib/puppet/provider/service/freebsd.rb
+++ b/lib/puppet/provider/service/freebsd.rb
@@ -1,143 +1,143 @@
 Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   desc "Provider for FreeBSD and DragonFly BSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
 
   confine :operatingsystem => [:freebsd, :dragonfly]
   defaultfor :operatingsystem => [:freebsd, :dragonfly]
 
   def rcconf()        '/etc/rc.conf' end
   def rcconf_local()  '/etc/rc.conf.local' end
   def rcconf_dir()    '/etc/rc.conf.d' end
 
   def self.defpath
     superclass.defpath
   end
 
   def error(msg)
     raise Puppet::Error, msg
   end
 
   # Executing an init script with the 'rcvar' argument returns
   # the service name, rcvar name and whether it's enabled/disabled
   def rcvar
     rcvar = execute([self.initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
     rcvar = rcvar.split("\n")
     rcvar.delete_if {|str| str =~ /^#\s*$/}
     rcvar[1] = rcvar[1].gsub(/^\$/, '')
     rcvar
   end
 
+  # Extract value name from service or rcvar
+  def extract_value_name(name, rc_index, regex, regex_index)
+    value_name = self.rcvar[rc_index]
+    self.error("No #{name} name found in rcvar") if value_name.nil?
+    value_name = value_name.gsub!(regex, regex_index)
+    self.error("#{name} name is empty") if value_name.nil?
+    self.debug("#{name} name is #{value_name}")
+    value_name
+  end
+
   # Extract service name
   def service_name
-    name = self.rcvar[0]
-    self.error("No service name found in rcvar") if name.nil?
-    name = name.gsub!(/# (.*)/, '\1')
-    self.error("Service name is empty") if name.nil?
-    self.debug("Service name is #{name}")
-    name
+    extract_value_name('service', 0, /# (.*)/, '\1')
   end
 
   # Extract rcvar name
   def rcvar_name
-    name = self.rcvar[1]
-    self.error("No rcvar name found in rcvar") if name.nil?
-    name = name.gsub!(/(.*?)(_enable)?=(.*)/, '\1')
-    self.error("rcvar name is empty") if name.nil?
-    self.debug("rcvar name is #{name}")
-    name
+    extract_value_name('rcvar', 1, /(.*?)(_enable)?=(.*)/, '\1')
   end
 
   # Extract rcvar value
   def rcvar_value
     value = self.rcvar[1]
     self.error("No rcvar value found in rcvar") if value.nil?
     value = value.gsub!(/(.*)(_enable)?="?(\w+)"?/, '\3')
     self.error("rcvar value is empty") if value.nil?
     self.debug("rcvar value is #{value}")
     value
   end
 
   # Edit rc files and set the service to yes/no
   def rc_edit(yesno)
     service = self.service_name
     rcvar = self.rcvar_name
     self.debug("Editing rc files: setting #{rcvar} to #{yesno} for #{service}")
     self.rc_add(service, rcvar, yesno) if not self.rc_replace(service, rcvar, yesno)
   end
 
   # Try to find an existing setting in the rc files
   # and replace the value
   def rc_replace(service, rcvar, yesno)
     success = false
     # Replace in all files, not just in the first found with a match
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
       if Puppet::FileSystem.exist?(filename)
         s = File.read(filename)
         if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
           File.open(filename, File::WRONLY) { |f| f << s }
           self.debug("Replaced in #{filename}")
           success = true
         end
       end
     end
     success
   end
 
   # Add a new setting to the rc files
   def rc_add(service, rcvar, yesno)
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
     if Puppet::FileSystem.exist?(rcconf_dir)
       File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
         |f| f << append
         self.debug("Appended to #{f.path}")
       }
     else
       # Else, check the local rc file first, but don't create it
       if Puppet::FileSystem.exist?(rcconf_local)
         File.open(rcconf_local, File::WRONLY | File::APPEND) {
           |f| f << append
           self.debug("Appended to #{f.path}")
         }
       else
         # At last use the standard rc.conf file
         File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) {
           |f| f << append
           self.debug("Appended to #{f.path}")
         }
       end
     end
   end
 
   def enabled?
     if /YES$/ =~ self.rcvar_value
       self.debug("Is enabled")
       return :true
     end
     self.debug("Is disabled")
     :false
   end
 
   def enable
     self.debug("Enabling")
     self.rc_edit("YES")
   end
 
   def disable
     self.debug("Disabling")
     self.rc_edit("NO")
   end
 
   def startcmd
     [self.initscript, :onestart]
   end
 
   def stopcmd
     [self.initscript, :onestop]
   end
 
   def statuscmd
     [self.initscript, :onestatus]
   end
 
 end