diff --git a/Aliases/qt b/Aliases/qt
deleted file mode 120000
index 3fb45448cf..0000000000
--- a/Aliases/qt
+++ /dev/null
@@ -1 +0,0 @@
-../Formula/qt5.rb
\ No newline at end of file
diff --git a/Aliases/qt5 b/Aliases/qt5
new file mode 120000
index 0000000000..f6482cf984
--- /dev/null
+++ b/Aliases/qt5
@@ -0,0 +1 @@
+../Formula/qt.rb
\ No newline at end of file
diff --git a/Formula/qt5.rb b/Formula/qt.rb
similarity index 89%
rename from Formula/qt5.rb
rename to Formula/qt.rb
index 4f34ff4d6f..c26580059a 100644
--- a/Formula/qt5.rb
+++ b/Formula/qt.rb
@@ -1,9 +1,9 @@
-# Patches for Qt5 must be at the very least submitted to Qt's Gerrit codereview
+# Patches for Qt must be at the very least submitted to Qt's Gerrit codereview
 # rather than their bug-report Jira. The latter is rarely reviewed by Qt.
-class Qt5 < Formula
+class Qt < Formula
   desc "Cross-platform application and UI framework"
   homepage "https://www.qt.io/"
-  revision 1
+  revision 2
   head "https://code.qt.io/qt/qt5.git", :branch => "5.8", :shallow => false
 
   stable do
@@ -54,9 +54,9 @@ class Qt5 < Formula
   # between the 5.5.1 and 5.6.0 releases. (Remove this as soon as feasible!)
   #
   # Core formulae known to fail without this patch (as of 2016-10-15):
-  #   * gnuplot  (with `--with-qt5` option)
-  #   * mkvtoolnix (with `--with-qt5` option, silent build failure)
-  #   * poppler    (with `--with-qt5` option)
+  #   * gnuplot  (with `--with-qt` option)
+  #   * mkvtoolnix (with `--with-qt` option, silent build failure)
+  #   * poppler    (with `--with-qt` option)
   patch do
     url "https://raw.githubusercontent.com/Homebrew/formula-patches/e8fe6567/qt5/restore-pc-files.patch"
     sha256 "48ff18be2f4050de7288bddbae7f47e949512ac4bcd126c2f504be2ac701158b"
@@ -123,14 +123,11 @@ class Qt5 < Formula
     end
 
     # Move `*.app` bundles into `libexec` to expose them to `brew linkapps` and
-    # because we don't like having them in `bin`. Also add a `-qt5` suffix to
-    # avoid conflict with the `*.app` bundles provided by the `qt` formula.
-    # (Note: This move/rename breaks invocation of Assistant via the Help menu
+    # because we don't like having them in `bin`.
+    # (Note: This move breaks invocation of Assistant via the Help menu
     # of both Designer and Linguist as that relies on Assistant being in `bin`.)
     libexec.mkpath
-    Pathname.glob("#{bin}/*.app") do |app|
-      mv app, libexec/"#{app.basename(".app")}-qt5.app"
-    end
+    Pathname.glob("#{bin}/*.app") {|app| mv app, libexec }
   end
 
   def caveats; <<-EOS.undent
diff --git a/formula_renames.json b/formula_renames.json
index 25662b4b34..df46521a09 100644
--- a/formula_renames.json
+++ b/formula_renames.json
@@ -130,6 +130,7 @@
   "ppl011": "ppl@0.11",
   "protobuf250": "protobuf@2.5",
   "protobuf260": "protobuf@2.6",
+  "qt5": "qt",
   "qt55": "qt@5.5",
   "racket": "minimal-racket",
   "rebar3": "rebar@3",