diff --git a/History.md b/History.md
index 636e36a911..6bbdfdb9dc 100644
--- a/History.md
+++ b/History.md
@@ -7,6 +7,7 @@
 * Allow using authType in Facebook login [PR #5694](https://github.com/meteor/meteor/pull/5694)
 * Adds flush() method to Tracker to force recomputation [PR #4710](https://github.com/meteor/meteor/pull/4710)
 * Adds `defineMutationMethods` option (default: true) to `new Mongo.Collection` to override default behavior that sets up mutation methods (/collection/[insert|update...]) [PR #5778](https://github.com/meteor/meteor/pull/5778)
+* Allow overridding the default warehouse url by specifying `METEOR_WAREHOUSE_URLBASE` [PR #7054](https://github.com/meteor/meteor/pull/7054)
 
 ## v1.3.2.3
 
diff --git a/tools/packaging/warehouse.js b/tools/packaging/warehouse.js
index 585090d0d1..e17f33d4d7 100644
--- a/tools/packaging/warehouse.js
+++ b/tools/packaging/warehouse.js
@@ -43,7 +43,9 @@ var files = require('../fs/files.js');
 var httpHelpers = require('../utils/http-helpers.js');
 var fiberHelpers = require('../utils/fiber-helpers.js');
 
-var WAREHOUSE_URLBASE = 'https://warehouse.meteor.com';
+// Use `METEOR_WAREHOUSE_URLBASE` to override the default warehouse
+// url base. 
+var WAREHOUSE_URLBASE = process.env.METEOR_WAREHOUSE_URLBASE || 'https://warehouse.meteor.com';
 
 var warehouse = exports;
 _.extend(warehouse, {