diff --git a/Formula/swi-prolog.rb b/Formula/swi-prolog.rb
index 45a8e55f51c..5668c639d46 100644
--- a/Formula/swi-prolog.rb
+++ b/Formula/swi-prolog.rb
@@ -5,14 +5,29 @@ class SwiProlog <Formula
   homepage 'http://www.swi-prolog.org/'
   md5 '9168a2c872d2130467c3e74b80ed3ee0'
 
-  depends_on "gmp"
-  depends_on "readline"
+  depends_on 'pkg-config'
+  depends_on 'readline'
+  depends_on 'gmp'
+  depends_on 'jpeg'
+  depends_on 'fontconfig' if MACOS_VERSION < 10.6
+  depends_on 'ncursesw'
+  depends_on 'mcrypt'
+  depends_on 'gawk'
+
+  def options
+    [['--lite', "Don't install any packages"]]
+  end
 
   def install
-    # doesn't pick up gmp otherwise
-    ENV.append "CFLAGS", ENV['CPPFLAGS']
+    ENV['CIFLAGS'] = ENV['CPPFLAGS']
+    if ARGV.include? '--lite'
+      world = ''
+    else
+      world = '--with-world'
+    end
 
-    system "./configure", "--prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}", world, "--x-includes=/usr/X11/include",
+                          "--x-libraries=/usr/X11/lib", "--mandir=#{man}"
     system "make"
     system "make install"
   end