diff --git a/Formula/vc4asm.rb b/Formula/vc4asm.rb
index d09a30fd7d..3fc3619063 100644
--- a/Formula/vc4asm.rb
+++ b/Formula/vc4asm.rb
@@ -1,8 +1,8 @@
 class Vc4asm < Formula
   desc "Macro assembler for Broadcom VideoCore IV aka Raspberry Pi GPU"
   homepage "http://maazl.de/project/vc4asm/doc/index.html"
-  url "https://github.com/maazl/vc4asm/archive/V0.2.1.tar.gz"
-  sha256 "c9ffb315961a634cef1a26620a73483e7b819a963374952046aa7099d7ceb25c"
+  url "https://github.com/maazl/vc4asm/archive/V0.2.2.tar.gz"
+  sha256 "6f3da580aacecfd68219771d28ceddab987d26ca38eb4e38d8a93423e30eacb2"
 
   bottle do
     cellar :any_skip_relocation
@@ -14,18 +14,13 @@ class Vc4asm < Formula
 
   needs :cxx11
 
-  # Removes ELF support for OSX (merged upstream)
-  patch do
-    url "https://github.com/maazl/vc4asm/pull/7.patch"
-    sha256 "50e8d58bf406aed69c8e247cb447353cc7a9fb6d5c6c7862c6447bf28a4c8779"
-  end
-  patch do
-    url "https://github.com/maazl/vc4asm/commit/e2e855cd728f7f2eab45499dd251cf63db19c0cb.patch"
-    sha256 "72aa18f016669cdafec927b917f951f30c3f8946f1e8a4df1fd0016c171fa6d4"
-  end
-
   def install
     ENV.cxx11
+
+    # Fixes "use of undeclared identifier 'fabs'" and similar errors
+    inreplace "src/AssembleInst.cpp", "#include <cstdlib>",
+                                      "#include <cstdlib>\n#include <cmath>"
+
     cd "src" do
       system "make"
     end
@@ -37,7 +32,7 @@ class Vc4asm < Formula
     (testpath/"test.qasm").write <<-EOS.undent
       mov -, sacq(9)
       add r0, r4, ra1.unpack8b
-      add.unpack8a r0, r4, ra1
+      add.unpack8ai r0, r4, ra1
       add r0, r4.8a, ra1
     EOS
     system "#{bin}/vc4asm", "-o test.hex", "-V", "#{share}/vc4.qinc", "test.qasm"