diff --git a/Formula/ocrad.rb b/Formula/ocrad.rb
index f2b075ac04..629d321f5d 100644
--- a/Formula/ocrad.rb
+++ b/Formula/ocrad.rb
@@ -1,19 +1,14 @@
 require 'formula'
 
 class Ocrad < Formula
-  url 'http://ftpmirror.gnu.org/ocrad/ocrad-0.20.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/ocrad/ocrad-0.20.tar.gz'
   homepage 'http://www.gnu.org/software/ocrad/'
-  md5 '47040630580dbc75ce16f4a4fabede3f'
+  url 'http://ftpmirror.gnu.org/ocrad/ocrad-0.21.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/ocrad/ocrad-0.21.tar.gz'
+  md5 '83f9eae9d808f9d86c181538d3f64aed'
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
-
-    inreplace "Makefile" do |s|
-      s.change_make_var! "CPPFLAGS", ENV['CPPFLAGS']
-      s.change_make_var! "CXXFLAGS", ENV['CXXFLAGS']
-    end
-
-    system "make install"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make", "install", "CXXFLAGS=#{ENV['CXXFLAGS']}"
   end
 end