diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
index c985cfd9f96f..422711d7e34d 100644
--- a/Library/Formula/graphicsmagick.rb
+++ b/Library/Formula/graphicsmagick.rb
@@ -10,6 +10,7 @@ class Graphicsmagick < Formula
   option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit'
   option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit'
   option 'without-magick-plus-plus', 'disable build/install of Magick++'
+  option 'with-svg', 'Compile with svg support'
 
   depends_on :libltdl
 
@@ -25,11 +26,7 @@ class Graphicsmagick < Formula
   depends_on 'little-cms2' => :optional
   depends_on 'jasper' => :optional
   depends_on 'libwmf' => :optional
-  depends_on 'librsvg' => :optional
-  depends_on 'liblqr' => :optional
-  depends_on 'openexr' => :optional
   depends_on 'ghostscript' => :optional
-  depends_on 'webp' => :optional
 
   opoo '--with-ghostscript is not recommended' if build.with? 'ghostscript'
   if build.with? 'openmp' and (MacOS.version == 10.5 or ENV.compiler == :clang)
@@ -54,11 +51,9 @@ def install
              "--with-modules"]
 
     args << "--disable-openmp" unless build.include? 'enable-openmp'
-    args << "--disable-opencl" if build.include? 'disable-opencl'
     args << "--without-gslib" unless build.with? 'ghostscript'
     args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" unless build.with? 'ghostscript'
     args << "--without-magick-plus-plus" if build.without? 'magick-plus-plus'
-    args << "--enable-hdri=yes" if build.include? 'enable-hdri'
 
     if build.with? 'quantum-depth-32'
       quantum_depth = 32
@@ -69,10 +64,11 @@ def install
     end
 
     args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth
-    args << "--with-rsvg" if build.with? 'librsvg'
     args << "--without-x" unless build.with? 'x11'
-    args << "--with-freetype=yes" if build.with? 'freetype'
-    args << "--with-webp=yes" if build.include? 'webp'
+    args << "--without-ttf" if build.without? 'freetype'
+    args << "--without-xml" unless build.with? 'svg'
+    args << "--without-lcms" unless build.with? 'little-cms'
+    args << "--without-lcms2" unless build.with? 'little-cms2'
 
     # versioned stuff in main tree is pointless for us
     inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'