diff --git a/Formula/libvirt.rb b/Formula/libvirt.rb
new file mode 100644
index 00000000000..d42979ceb22
--- /dev/null
+++ b/Formula/libvirt.rb
@@ -0,0 +1,51 @@
+require 'formula'
+
+# This formula provides the libvirt daemon (libvirtd), development libraries, and the
+# virsh command line tool.  This allows people to manage their virtualisation servers
+# remotely, and (as this continues to be developed) manage virtualisation servers
+# running on the local host
+
+class Libvirt <Formula
+  homepage 'http://www.libvirt.org'
+  url 'http://justinclift.fedorapeople.org/libvirt_experimental/libvirt-0.8.4-6.tar.gz'
+  md5 '88c00d745d18159e5a05a5d49a571bc7'
+
+  depends_on "gawk"
+  depends_on "gnutls"
+
+  def options
+    [['--without-libvirtd', 'Build only the virsh client and development libraries.']]
+  end
+
+  def install
+    fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
+    args = ["--prefix=#{prefix}",
+            "--localstatedir=#{var}",
+            "--mandir=#{man}",
+            "--sysconfdir=#{etc}"]
+
+    args << "--without-libvirtd" if ARGV.include? '--without-libvirtd'
+
+    system "./configure", *args
+
+    # Compilation of docs doesn't get done if we jump straight to "make install"
+    system "make"
+    system "make install"
+
+    # Update the SASL config file with the Homebrew prefix
+    inreplace "#{etc}/sasl2/libvirt.conf" do |s|
+      s.gsub! "/etc/", "#{HOMEBREW_PREFIX}/etc/"
+      s.gsub! "/var/", "#{HOMEBREW_PREFIX}/var/"
+    end
+
+    # If the libvirt daemon is built, update its config file to reflect
+    # the Homebrew prefix
+    unless ARGV.include? '--without-libvirtd'
+      inreplace "#{etc}/libvirt/libvirtd.conf" do |s|
+        s.gsub! "/etc/", "#{HOMEBREW_PREFIX}/etc/"
+        s.gsub! "/var/", "#{HOMEBREW_PREFIX}/var/"
+      end
+    end
+  end
+end