diff --git a/Aliases/saltstack b/Aliases/saltstack
new file mode 120000
index 0000000000..c5ea099f69
--- /dev/null
+++ b/Aliases/saltstack
@@ -0,0 +1 @@
+../Formula/salt.rb
\ No newline at end of file
diff --git a/Formula/saltstack.rb b/Formula/salt.rb
similarity index 99%
rename from Formula/saltstack.rb
rename to Formula/salt.rb
index 3baf76d342..09e9c619d2 100644
--- a/Formula/saltstack.rb
+++ b/Formula/salt.rb
@@ -1,4 +1,4 @@
-class Saltstack < Formula
+class Salt < Formula
   include Language::Python::Virtualenv
 
   desc "Dynamic infrastructure communication bus"
diff --git a/formula_renames.json b/formula_renames.json
index f5970bae68..6c2261a040 100644
--- a/formula_renames.json
+++ b/formula_renames.json
@@ -165,6 +165,7 @@
   "ruby21": "ruby@2.1",
   "ruby22": "ruby@2.2",
   "ruby23": "ruby@2.3",
+  "saltstack": "salt",
   "scala210": "scala@2.10",
   "scala211": "scala@2.11",
   "screenbrightness": "brightness",