diff --git a/lib/puppet/face/module/install.rb b/lib/puppet/face/module/install.rb
index e6a101c44..13db76b87 100644
--- a/lib/puppet/face/module/install.rb
+++ b/lib/puppet/face/module/install.rb
@@ -1,146 +1,137 @@
 # encoding: UTF-8
 require 'puppet/forge'
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:install) do
-    summary "Install a module from the Puppet Forge or a release archive."
+    summary "Install a module from a repository or release archive."
     description <<-EOT
-      Installs a module from the Puppet Forge or from a release archive file.
+      Installs a module from the Puppet Forge, from a release archive file
+      on-disk, or from a private Forge-like repository.
 
       The specified module will be installed into the directory
       specified with the `--target-dir` option, which defaults to
       #{Puppet.settings[:modulepath].split(File::PATH_SEPARATOR).first}.
     EOT
 
     returns "Pathname object representing the path to the installed module."
 
     examples <<-EOT
       Install a module:
 
       $ puppet module install puppetlabs-vcsrepo
       Preparing to install into /etc/puppet/modules ...
       Downloading from http://forge.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module to a specific environment:
 
       $ puppet module install puppetlabs-vcsrepo --environment development
       Preparing to install into /etc/puppet/environments/development/modules ...
       Downloading from http://forge.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/environments/development/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a specific module version:
 
       $ puppet module install puppetlabs-vcsrepo -v 0.0.4
       Preparing to install into /etc/puppet/modules ...
       Downloading from http://forge.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory:
 
       $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules
       Preparing to install into /usr/share/puppet/modules ...
       Downloading from http://forge.puppetlabs.com ...
       Installing -- do not interrupt ...
       /usr/share/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory and check for dependencies in other directories:
 
       $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules --modulepath /etc/puppet/modules
       Preparing to install into /usr/share/puppet/modules ...
       Downloading from http://forge.puppetlabs.com ...
       Installing -- do not interrupt ...
       /usr/share/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive:
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz
       Preparing to install into /etc/puppet/modules ...
       Downloading from http://forge.puppetlabs.com ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive and ignore dependencies:
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz --ignore-dependencies
       Preparing to install into /etc/puppet/modules ...
       Installing -- do not interrupt ...
       /etc/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
     EOT
 
     arguments "<name>"
 
     option "--force", "-f" do
       summary "Force overwrite of existing module, if any."
       description <<-EOT
         Force overwrite of existing module, if any.
       EOT
     end
 
     option "--target-dir DIR", "-i DIR" do
       summary "The directory into which modules are installed."
       description <<-EOT
         The directory into which modules are installed; defaults to the first
         directory in the modulepath.
 
         Specifying this option will change the installation directory, and
         will use the existing modulepath when checking for dependencies. If
         you wish to check a different set of directories for dependencies, you
         must also use the `--environment` or `--modulepath` options.
       EOT
     end
 
     option "--ignore-dependencies" do
       summary "Do not attempt to install dependencies"
       description <<-EOT
         Do not attempt to install dependencies.
       EOT
     end
 
     option "--version VER", "-v VER" do
       summary "Module version to install."
       description <<-EOT
         Module version to install; can be an exact version or a requirement string,
         eg '>= 1.0.3'. Defaults to latest version.
       EOT
     end
 
     when_invoked do |name, options|
       Puppet::ModuleTool.set_option_defaults options
-      sep = File::PATH_SEPARATOR
-
-      if options[:target_dir]
-        options[:target_dir] = File.expand_path(options[:target_dir])
-        options[:modulepath] = "#{options[:target_dir]}#{sep}#{options[:modulepath]}"
-      end
-
-      Puppet.settings[:modulepath] = options[:modulepath]
-      options[:target_dir] = Puppet.settings[:modulepath].split(sep).first
-
       Puppet.notice "Preparing to install into #{options[:target_dir]} ..."
       Puppet::ModuleTool::Applications::Installer.new(name, Puppet::Forge.new("PMT", self.version), options).run
     end
 
     when_rendering :console do |return_value, name, options|
       if return_value[:result] == :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else
         tree = Puppet::ModuleTool.build_tree(return_value[:installed_modules], return_value[:install_dir])
         return_value[:install_dir] + "\n" +
         Puppet::ModuleTool.format_tree(tree)
       end
     end
   end
 end
diff --git a/lib/puppet/face/module/search.rb b/lib/puppet/face/module/search.rb
index 68516beaa..36cca8f4b 100644
--- a/lib/puppet/face/module/search.rb
+++ b/lib/puppet/face/module/search.rb
@@ -1,90 +1,90 @@
 require 'puppet/util/terminal'
 require 'puppet/forge'
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:search) do
-    summary "Search the Puppet Forge for a module."
+    summary "Search a repository for a module."
     description <<-EOT
-      Searches the Puppet Forge for modules whose names, descriptions, or keywords
+      Searches a repository for modules whose names, descriptions, or keywords
       match the provided search term.
     EOT
 
     returns "Array of module metadata hashes"
 
     examples <<-EOT
-      Search the Puppet Forge for a module:
+      Search the default repository for a module:
 
       $ puppet module search puppetlabs
       NAME          DESCRIPTION                          AUTHOR             KEYWORDS
       bacula        This is a generic Apache module      @puppetlabs        backups
     EOT
 
     arguments "<search_term>"
 
     when_invoked do |term, options|
       Puppet::ModuleTool.set_option_defaults options
       Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new("PMT", self.version), options).run
     end
 
     when_rendering :console do |results, term, options|
       return "No results found for '#{term}'." if results.empty?
 
       padding = '  '
       headers = {
         'full_name' => 'NAME',
         'desc'      => 'DESCRIPTION',
         'author'    => 'AUTHOR',
         'tag_list'  => 'KEYWORDS',
       }
 
       min_widths = Hash[ *headers.map { |k,v| [k, v.length] }.flatten ]
       min_widths['full_name'] = min_widths['author'] = 12
 
       min_width = min_widths.inject(0) { |sum,pair| sum += pair.last } + (padding.length * (headers.length - 1))
 
       terminal_width = [Puppet::Util::Terminal.width, min_width].max
 
       columns = results.inject(min_widths) do |hash, result|
         {
           'full_name' => [ hash['full_name'], result['full_name'].length          ].max,
           'desc'      => [ hash['desc'],      result['desc'].length               ].max,
           'author'    => [ hash['author'],    "@#{result['author']}".length       ].max,
           'tag_list'  => [ hash['tag_list'],  result['tag_list'].join(' ').length ].max,
         }
       end
 
       flex_width = terminal_width - columns['full_name'] - columns['author'] - (padding.length * (headers.length - 1))
       tag_lists = results.map { |r| r['tag_list'] }
 
       while (columns['tag_list'] > flex_width / 3)
         longest_tag_list = tag_lists.sort_by { |tl| tl.join(' ').length }.last
         break if [ [], [term] ].include? longest_tag_list
         longest_tag_list.delete(longest_tag_list.sort_by { |t| t == term ? -1 : t.length }.last)
         columns['tag_list'] =  tag_lists.map { |tl| tl.join(' ').length }.max
       end
 
       columns['tag_list'] = [
         flex_width / 3,
         tag_lists.map { |tl| tl.join(' ').length }.max,
       ].max
       columns['desc'] = flex_width - columns['tag_list']
 
       format = %w{full_name desc author tag_list}.map do |k|
         "%-#{ [ columns[k], min_widths[k] ].max }s"
       end.join(padding) + "\n"
 
       highlight = proc do |s|
         s = s.gsub(term, colorize(:green, term))
         s = s.gsub(term.gsub('/', '-'), colorize(:green, term.gsub('/', '-'))) if term =~ /\//
         s
       end
 
       format % [ headers['full_name'], headers['desc'], headers['author'], headers['tag_list'] ] +
       results.map do |match|
         name, desc, author, keywords = %w{full_name desc author tag_list}.map { |k| match[k] }
         desc = desc[0...(columns['desc'] - 3)] + '...' if desc.length > columns['desc']
         highlight[format % [ name.sub('/', '-'), desc, "@#{author}", [keywords].flatten.join(' ') ]]
       end.join
     end
   end
 end
diff --git a/spec/unit/face/module/install_spec.rb b/spec/unit/face/module/install_spec.rb
index 81c72f6e6..f8278d369 100644
--- a/spec/unit/face/module/install_spec.rb
+++ b/spec/unit/face/module/install_spec.rb
@@ -1,179 +1,168 @@
 require 'spec_helper'
 require 'puppet/face'
 require 'puppet/module_tool'
 
 describe "puppet module install" do
   include PuppetSpec::Files
 
   subject { Puppet::Face[:module, :current] }
 
   let(:options) do
     {}
   end
 
   describe "option validation" do
     before do
       Puppet.settings[:modulepath] = fakemodpath
     end
 
     let(:expected_options) do
       {
         :target_dir  => fakefirstpath,
         :modulepath  => fakemodpath,
         :environment => 'production'
       }
     end
 
     let(:sep) { File::PATH_SEPARATOR }
     let(:fakefirstpath)  { make_absolute("/my/fake/modpath") }
     let(:fakesecondpath) { make_absolute("/other/fake/path") }
     let(:fakemodpath)    { "#{fakefirstpath}#{sep}#{fakesecondpath}" }
     let(:fakedirpath)    { make_absolute("/my/fake/path") }
 
     context "without any options" do
       it "should require a name" do
         pattern = /wrong number of arguments/
         expect { subject.install }.to raise_error ArgumentError, pattern
       end
 
       it "should not require any options" do
         expects_installer_run_with("puppetlabs-apache", expected_options)
 
         subject.install("puppetlabs-apache")
       end
     end
 
     it "should accept the --force option" do
       options[:force] = true
       expected_options.merge!(options)
 
       expects_installer_run_with("puppetlabs-apache", expected_options)
 
       subject.install("puppetlabs-apache", options)
     end
 
     it "should accept the --target-dir option" do
       options[:target_dir] = make_absolute("/foo/puppet/modules")
       expected_options.merge!(options)
       expected_options[:modulepath] = "#{options[:target_dir]}#{sep}#{fakemodpath}"
 
       expects_installer_run_with("puppetlabs-apache", expected_options)
 
       subject.install("puppetlabs-apache", options)
     end
 
     it "should accept the --version option" do
       options[:version] = "0.0.1"
       expected_options.merge!(options)
 
       expects_installer_run_with("puppetlabs-apache", expected_options)
 
       subject.install("puppetlabs-apache", options)
     end
 
     it "should accept the --ignore-dependencies option" do
       options[:ignore_dependencies] = true
       expected_options.merge!(options)
 
       expects_installer_run_with("puppetlabs-apache", expected_options)
 
       subject.install("puppetlabs-apache", options)
     end
 
     describe "when modulepath option is passed" do
       let(:expected_options) { { :modulepath => fakemodpath, :environment => Puppet[:environment] } }
       let(:options)          { { :modulepath => fakemodpath } }
 
       describe "when target-dir option is not passed" do
         it "should set target-dir to be first path from modulepath" do
           expected_options[:target_dir] = fakefirstpath
 
           expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
 
           Puppet.settings[:modulepath].should == fakemodpath
         end
       end
 
       describe "when target-dir option is passed" do
-        it "should expand the target directory" do
-          options[:target_dir] = "modules"
-          expanded_path = File.expand_path("modules")
-          expected_options.merge!(options)
-          expected_options[:target_dir] = expanded_path
-          expected_options[:modulepath] = "#{expanded_path}#{sep}#{fakemodpath}"
-
-          Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
-          subject.install("puppetlabs-apache", options)
-        end
-
         it "should set target-dir to be first path of modulepath" do
           options[:target_dir] = fakedirpath
           expected_options[:target_dir] = fakedirpath
           expected_options[:modulepath] = "#{fakedirpath}#{sep}#{fakemodpath}"
 
           expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
 
           Puppet.settings[:modulepath].should == "#{fakedirpath}#{sep}#{fakemodpath}"
         end
       end
     end
 
     describe "when modulepath option is not passed" do
       before do
         Puppet.settings[:modulepath] = fakemodpath
       end
 
       describe "when target-dir option is not passed" do
         it "should set target-dir to be first path of default mod path" do
           expected_options[:target_dir] = fakefirstpath
           expected_options[:modulepath] = fakemodpath
 
           expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
         end
       end
 
       describe "when target-dir option is passed" do
         it "should prepend target-dir to modulepath" do
           options[:target_dir] = fakedirpath
           expected_options[:target_dir] = fakedirpath
           expected_options[:modulepath] = "#{options[:target_dir]}#{sep}#{fakemodpath}"
 
           expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
           Puppet.settings[:modulepath].should == expected_options[:modulepath]
         end
       end
     end
   end
 
   describe "inline documentation" do
     subject { Puppet::Face[:module, :current].get_action :install }
 
     its(:summary)     { should =~ /install.*module/im }
     its(:description) { should =~ /install.*module/im }
     its(:returns)     { should =~ /pathname/i }
     its(:examples)    { should_not be_empty }
 
     %w{ license copyright summary description returns examples }.each do |doc|
       context "of the" do
         its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
       end
     end
   end
 
   def expects_installer_run_with(name, options)
     installer = mock("Installer")
     forge = mock("Forge")
 
     Puppet::Forge.expects(:new).with("PMT", subject.version).returns(forge)
     Puppet::ModuleTool::Applications::Installer.expects(:new).with("puppetlabs-apache", forge, expected_options).returns(installer)
     installer.expects(:run)
   end
 end