diff --git a/Formula/mkvtoolnix.rb b/Formula/mkvtoolnix.rb
index 63ae4dea49..fef95f3b5b 100644
--- a/Formula/mkvtoolnix.rb
+++ b/Formula/mkvtoolnix.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Mkvtoolnix <Formula
-  url 'http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-3.3.0.tar.bz2'
+  url 'http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-4.0.0.tar.bz2'
   homepage 'http://www.bunkus.org/videotools/mkvtoolnix/'
-  md5 'a002b6537e4515b6a0b26f42e8a2eb9a'
+  md5 '434eb24b9c49a99ac386bd2c4c525538'
 
   depends_on 'boost'
   depends_on 'libvorbis'
@@ -21,6 +21,7 @@ class Mkvtoolnix <Formula
 
     system "./configure", "--disable-debug",
                           "--prefix=#{prefix}",
+                          "--with-boost-libdir=#{HOMEBREW_PREFIX}/lib", # For non-/usr/local prefix
                           "--with-boost-regex=boost_regex-mt", # via macports
                           flac_flag,
                           "--disable-gui", "--disable-wxwidgets"