diff --git a/Formula/ffmpeg.rb b/Formula/ffmpeg.rb
index b9cead6861..1eddaa2418 100644
--- a/Formula/ffmpeg.rb
+++ b/Formula/ffmpeg.rb
@@ -1,12 +1,13 @@
 require 'formula'
 
 class Ffmpeg < Formula
-  url 'http://ffmpeg.org/releases/ffmpeg-0.6.3.tar.bz2'
+  url 'http://ffmpeg.org/releases/ffmpeg-0.8.tar.bz2'
   homepage 'http://ffmpeg.org/'
-  sha1 '25dd82e8a3627a1a9d4464e15685720215fecb3c'
+  sha1 '461f87c4fc080e10ac0acc48287aaa706021bbc4'
 
   head 'git://git.videolan.org/ffmpeg.git'
 
+  depends_on 'yasm' => :build
   depends_on 'x264' => :optional
   depends_on 'faac' => :optional
   depends_on 'faad2' => :optional
@@ -18,13 +19,11 @@ class Ffmpeg < Formula
   depends_on 'xvid' => :optional
 
   def install
-    args = ["--disable-debug",
-            "--prefix=#{prefix}",
-            "--enable-shared",
-            "--enable-pthreads",
-            "--enable-nonfree",
+    args = ["--prefix=#{prefix}",
             "--enable-gpl",
-            "--disable-indev=jack"]
+            "--enable-version3",
+            "--enable-nonfree",
+            "--enable-hardcoded-tables"]
 
     args << "--enable-libx264" if Formula.factory('x264').installed?
     args << "--enable-libfaac" if Formula.factory('faac').installed?
@@ -34,10 +33,6 @@ class Ffmpeg < Formula
     args << "--enable-libvpx" if Formula.factory('libvpx').installed?
     args << "--enable-libxvid" if Formula.factory('xvid').installed?
 
-    unless ARGV.build_head?
-      args << "--enable-libfaad" if Formula.factory('faad2').installed?
-    end
-
     # For 32-bit compilation under gcc 4.2, see:
     # http://trac.macports.org/ticket/20938#comment:22
     if MacOS.snow_leopard? and Hardware.is_32_bit?