diff --git a/Formula/wireshark.rb b/Formula/wireshark.rb
index 27c2d4b7f7..847796d8f9 100644
--- a/Formula/wireshark.rb
+++ b/Formula/wireshark.rb
@@ -2,9 +2,9 @@ class Wireshark < Formula
   homepage "https://www.wireshark.org"
 
   stable do
-    url "https://www.wireshark.org/download/src/all-versions/wireshark-1.12.3.tar.bz2"
-    mirror "https://1.eu.dl.wireshark.org/src/wireshark-1.12.3.tar.bz2"
-    sha1 "44ad77b6e80f41ba34ac0eaf477b81cb1345ceed"
+    url "https://www.wireshark.org/download/src/all-versions/wireshark-1.12.4.tar.bz2"
+    mirror "https://1.eu.dl.wireshark.org/src/wireshark-1.12.4.tar.bz2"
+    sha256 "de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312"
 
     # Removes SDK checks that prevent the build from working on CLT-only systems
     # Reported upstream: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9290
@@ -28,9 +28,9 @@ class Wireshark < Formula
   end
 
   devel do
-    url "https://www.wireshark.org/download/src/all-versions/wireshark-1.99.2.tar.bz2"
-    mirror "https://1.eu.dl.wireshark.org/src/wireshark-1.99.2.tar.bz2"
-    sha1 "8baea1300cca0fe4e5c552113e3521dc8fccdb48"
+    url "https://www.wireshark.org/download/src/all-versions/wireshark-1.99.3.tar.bz2"
+    mirror "https://1.eu.dl.wireshark.org/src/wireshark-1.99.3.tar.bz2"
+    sha256 "9bd80a3159c8b60e86b41ee9e3b0380f8a6a664eb5182c54269a1e9c9acb9936"
 
     depends_on "homebrew/dupes/libpcap" if MacOS.version == :mavericks
   end
@@ -61,14 +61,16 @@ class Wireshark < Formula
   depends_on "gnome-icon-theme" if build.with? "gtk+3"
 
   def install
+    no_gui = build.without?("gtk+3") && build.without?("qt") && build.without?("gtk+") && build.without?("qt5")
+
     args = ["--disable-dependency-tracking",
             "--disable-silent-rules",
             "--prefix=#{prefix}",
             "--with-gnutls"]
 
-    args << "--disable-wireshark" if build.without?("gtk+3") && build.without?("qt") && build.without?("gtk+") && build.without?("qt5")
+    args << "--disable-wireshark" if no_gui
     args << "--disable-gtktest" if build.without?("gtk+3") && build.without?("gtk+")
-    args << "--with-qt" if build.with? "qt" or build.with? "qt5"
+    args << "--with-qt" if build.with?("qt") || build.with?("qt5")
     args << "--with-gtk3" if build.with? "gtk+3"
     args << "--with-gtk2" if build.with? "gtk+"
     args << "--with-libcap=#{Formula["libpcap"].opt_prefix}" if build.with? "libpcap"
@@ -115,7 +117,7 @@ class Wireshark < Formula
   end
 
   test do
-    system "#{bin}/randpkt", "-b", "100", "-c", "2", "capture.pcap"
+    system bin/"randpkt", "-b", "100", "-c", "2", "capture.pcap"
     output = shell_output("#{bin}/capinfos -Tmc capture.pcap")
     assert_equal "File name,Number of packets\ncapture.pcap,2\n", output
   end