diff --git a/lib/puppet/file_serving/indirection_hooks.rb b/lib/puppet/file_serving/indirection_hooks.rb
index 7e0c17916..a85e90ef1 100644
--- a/lib/puppet/file_serving/indirection_hooks.rb
+++ b/lib/puppet/file_serving/indirection_hooks.rb
@@ -1,34 +1,34 @@
 #
 #  Created by Luke Kanies on 2007-10-18.
 #  Copyright (c) 2007. All rights reserved.
 
 require 'uri'
 require 'puppet/file_serving'
 
 # This module is used to pick the appropriate terminus
 # in file-serving indirections.  This is necessary because
 # the terminus varies based on the URI asked for.
 module Puppet::FileServing::IndirectionHooks
   PROTOCOL_MAP = {"puppet" => :rest, "file" => :file}
 
   # Pick an appropriate terminus based on the protocol.
   def select_terminus(request)
     # We rely on the request's parsing of the URI.
 
     # Short-circuit to :file if it's a fully-qualified path or specifies a 'file' protocol.
     return PROTOCOL_MAP["file"] if request.key =~ /^#{::File::SEPARATOR}/
     return PROTOCOL_MAP["file"] if request.protocol == "file"
 
-    # We're heading over the wire the protocol is 'puppet' and we've got a server name or we're not named 'puppet'
-    if request.protocol == "puppet" and (request.server or Puppet.settings[:name] != "puppet")
+    # We're heading over the wire the protocol is 'puppet' and we've got a server name or we're not named 'apply' or 'puppet'
+    if request.protocol == "puppet" and (request.server or !["puppet","apply"].include?(Puppet.settings[:name]))
       return PROTOCOL_MAP["puppet"]
     end
 
     if request.protocol and PROTOCOL_MAP[request.protocol].nil?
       raise(ArgumentError, "URI protocol '#{request.protocol}' is not currently supported for file serving")
     end
 
     # If we're still here, we're using the file_server or modules.
     :file_server
   end
 end
diff --git a/spec/shared_behaviours/file_serving.rb b/spec/shared_behaviours/file_serving.rb
index c86453a03..5f5b2b0af 100644
--- a/spec/shared_behaviours/file_serving.rb
+++ b/spec/shared_behaviours/file_serving.rb
@@ -1,60 +1,71 @@
 #!/usr/bin/env ruby
 #
 #  Created by Luke Kanies on 2007-10-18.
 #  Copyright (c) 2007. All rights reserved.
 
 describe "Puppet::FileServing::Files", :shared => true do
   it "should use the rest terminus when the 'puppet' URI scheme is used and a host name is present" do
     uri = "puppet://myhost/fakemod/my/file"
 
     # It appears that the mocking somehow interferes with the caching subsystem.
     # This mock somehow causes another terminus to get generated.
     term = @indirection.terminus(:rest)
     @indirection.stubs(:terminus).with(:rest).returns term
     term.expects(:find)
     @test_class.find(uri)
   end
 
-  it "should use the rest terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is not 'puppet'" do
+  it "should use the rest terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is not 'puppet' or 'apply'" do
     uri = "puppet:///fakemod/my/file"
     Puppet.settings.stubs(:value).returns "foo"
     Puppet.settings.stubs(:value).with(:name).returns("puppetd")
     Puppet.settings.stubs(:value).with(:modulepath).returns("")
     @indirection.terminus(:rest).expects(:find)
     @test_class.find(uri)
   end
 
   it "should use the file_server terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'puppet'" do
     uri = "puppet:///fakemod/my/file"
     Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil, :modulepath => []))
     Puppet.settings.stubs(:value).returns ""
     Puppet.settings.stubs(:value).with(:name).returns("puppet")
     Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")
     @indirection.terminus(:file_server).expects(:find)
     @indirection.terminus(:file_server).stubs(:authorized?).returns(true)
     @test_class.find(uri)
   end
 
+  it "should use the file_server terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'apply'" do
+    uri = "puppet:///fakemod/my/file"
+    Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil, :modulepath => []))
+    Puppet.settings.stubs(:value).returns ""
+    Puppet.settings.stubs(:value).with(:name).returns("apply")
+    Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")
+    @indirection.terminus(:file_server).expects(:find)
+    @indirection.terminus(:file_server).stubs(:authorized?).returns(true)
+    @test_class.find(uri)
+  end
+
   it "should use the file terminus when the 'file' URI scheme is used" do
     uri = "file:///fakemod/my/file"
     @indirection.terminus(:file).expects(:find)
     @test_class.find(uri)
   end
 
   it "should use the file terminus when a fully qualified path is provided" do
     uri = "/fakemod/my/file"
     @indirection.terminus(:file).expects(:find)
     @test_class.find(uri)
   end
 
   it "should use the configuration to test whether the request is allowed" do
     uri = "fakemod/my/file"
     mount = mock 'mount'
     config = stub 'configuration', :split_path => [mount, "eh"]
     @indirection.terminus(:file_server).stubs(:configuration).returns config
 
     @indirection.terminus(:file_server).expects(:find)
     mount.expects(:allowed?).returns(true)
     @test_class.find(uri, :node => "foo", :ip => "bar")
   end
 end