3 files changed, 28 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/tap-pin.rb b/Library/Homebrew/cmd/tap-pin.rb
new file mode 100644
index 000000000..8cc5d87f8
--- /dev/null
+++ b/Library/Homebrew/cmd/tap-pin.rb
@@ -0,0 +1,13 @@
+require "cmd/tap"
+
+module Homebrew
+  def tap_pin
+    taps = ARGV.named.map do |name|
+      Tap.new(*tap_args(name))
+    end
+    taps.each do |tap|
+      tap.pin
+      ohai "Pinned #{tap.name}"
+    end
+  end
+end
diff --git a/Library/Homebrew/cmd/tap-unpin.rb b/Library/Homebrew/cmd/tap-unpin.rb
new file mode 100644
index 000000000..c20fb8dda
--- /dev/null
+++ b/Library/Homebrew/cmd/tap-unpin.rb
@@ -0,0 +1,13 @@
+require "cmd/tap"
+
+module Homebrew
+  def tap_unpin
+    taps = ARGV.named.map do |name|
+      Tap.new(*tap_args(name))
+    end
+    taps.each do |tap|
+      tap.unpin
+      ohai "Unpinned #{tap.name}"
+    end
+  end
+end
diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index 793ad299d..1e8bfdcab 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -10,6 +10,8 @@ module Homebrew
       raise TapUnavailableError, tap.name unless tap.installed?
       puts "Untapping #{tap}... (#{tap.path.abv})"
 
+      tap.unpin if tap.pinned?
+
       formula_count = tap.formula_files.size
       tap.path.rmtree
       tap.path.dirname.rmdir_if_possible