diff --git a/Formula/id3lib.rb b/Formula/id3lib.rb
index f3c30165ec..8674b5c58e 100644
--- a/Formula/id3lib.rb
+++ b/Formula/id3lib.rb
@@ -1,14 +1,15 @@
 require 'formula'
 
 class Id3lib < Formula
-  url 'http://downloads.sourceforge.net/project/id3lib/id3lib/3.8.3/id3lib-3.8.3.tar.gz'
-  head "cvs://:pserver:anonymous@id3lib.cvs.sourceforge.net:/cvsroot/id3lib:id3lib-devel"
   homepage 'http://id3lib.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/id3lib/id3lib/3.8.3/id3lib-3.8.3.tar.gz'
   sha1 'c92c880da41d1ec0b242745a901702ae87970838'
 
+  head "cvs://:pserver:anonymous@id3lib.cvs.sourceforge.net:/cvsroot/id3lib:id3lib-devel"
+
   def patches
     p = []
-    p << DATA unless ARGV.build_head?
+    p << DATA unless build.head?
     # Fix main defined with unsigned int instead of int
     p << "https://trac.macports.org/export/90780/trunk/dports/audio/id3lib/files/id3lib-main.patch"
   end
@@ -19,7 +20,8 @@ class Id3lib < Formula
   end
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end