diff --git a/Formula/cgal.rb b/Formula/cgal.rb
index 92bd43d204..10b76510cc 100644
--- a/Formula/cgal.rb
+++ b/Formula/cgal.rb
@@ -1,18 +1,29 @@
 require 'formula'
 
 class Cgal <Formula
-  url 'https://gforge.inria.fr/frs/download.php/26688/CGAL-3.6.tar.gz'
-  md5 '78dbaf85df0a53ca0e87308d9cbf671e'
+  url 'https://gforge.inria.fr/frs/download.php/27641/CGAL-3.7.tar.gz'
+  md5 '0e4c17f436ec04848abc3273bb6ab3ee'
   homepage 'http://www.cgal.org/'
 
   depends_on 'cmake' => :build
   depends_on 'boost'
   depends_on 'gmp'
   depends_on 'mpfr'
-  depends_on 'qt' => :optional
+
+  depends_on 'qt' if ARGV.include? '--imaging'
+
+  def options
+    [['--imaging', "Build ImageIO and QT compoments of CGAL"]]
+  end
 
   def install
-    system "cmake", ".", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_BUILD_TYPE=Release"
+    args = ["-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_BUILD_TYPE=Release"]
+
+    unless ARGV.include? '--imaging'
+      args << "-DWITH_CGAL_Qt3=OFF" << "-DWITH_CGAL_Qt4=OFF" << "-DWITH_CGAL_ImageIO=OFF"
+    end
+
+    system "cmake", ".", *args
     system "make install"
   end
 end