diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index a23b41e605..dd51a03b02 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -24,7 +24,12 @@ git() {
 
 git_init_if_necessary() {
   BREW_OFFICIAL_REMOTE="https://github.com/Homebrew/brew"
-  CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core"
+  if [[ -n "$HOMEBREW_MACOS" ]] || [[ -n "$HOMEBREW_FORCE_HOMEBREW_ORG" ]]
+  then
+    CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core"
+  else
+    CORE_OFFICIAL_REMOTE="https://github.com/Linuxbrew/homebrew-core"
+  fi
 
   safe_cd "$HOMEBREW_REPOSITORY"
   if [[ ! -d ".git" ]]
diff --git a/Library/Homebrew/extend/os/linux/tap.rb b/Library/Homebrew/extend/os/linux/tap.rb
new file mode 100644
index 0000000000..ba8ae3e4f0
--- /dev/null
+++ b/Library/Homebrew/extend/os/linux/tap.rb
@@ -0,0 +1,9 @@
+class CoreTap < Tap
+  def default_remote
+    if ENV["HOMEBREW_FORCE_HOMEBREW_ORG"]
+      "https://github.com/Homebrew/homebrew-core".freeze
+    else
+      "https://github.com/Linuxbrew/homebrew-core".freeze
+    end
+  end
+end
diff --git a/Library/Homebrew/extend/os/tap.rb b/Library/Homebrew/extend/os/tap.rb
new file mode 100644
index 0000000000..93c67d484a
--- /dev/null
+++ b/Library/Homebrew/extend/os/tap.rb
@@ -0,0 +1 @@
+require "extend/os/linux/tap" if OS.linux?
diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 01f4b1e222..5efae23011 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -735,3 +735,5 @@ class TapConfig
     end
   end
 end
+
+require "extend/os/tap"