diff --git a/Formula/inspircd.rb b/Formula/inspircd.rb
index 9c3bdc12e0e..fd2d98f81fe 100644
--- a/Formula/inspircd.rb
+++ b/Formula/inspircd.rb
@@ -7,18 +7,33 @@ class Inspircd < Formula
 
   head 'https://github.com/inspircd/inspircd.git', :branch => 'insp20'
 
+  skip_clean 'data'
+  skip_clean 'logs'
+
   depends_on 'pkg-config' => :build
-  depends_on 'gnutls' => :recommended
-  depends_on 'libgcrypt' unless build.without? 'gnutls'
-  depends_on 'openssl' => :optional
+  depends_on 'geoip' => :optional
+  depends_on 'gnutls' => :optional
+  depends_on 'libgcrypt' if build.with? 'gnutls'
+  depends_on :mysql => :optional
   depends_on 'pcre' => :optional
+  depends_on 'sqlite' => :optional
   depends_on 'tre' => :optional
 
+  option 'without-ldap', 'Build without ldap support'
+  option 'without-openssl', 'Build without openssl support'
+  option 'without-postgres', 'Build without postgres support'
+
   def install
     modules = []
-    modules << 'm_ssl_gnutls.cpp' unless build.without? 'gnutls'
-    modules << 'm_ssl_openssl.cpp' if build.with? 'openssl'
+    modules << 'm_geoip.cpp' if build.with? 'geoip'
+    modules << 'm_ssl_gnutls.cpp' if build.with? 'gnutls'
+    modules << 'm_mysql.cpp' if build.with? 'mysql'
+    modules << 'm_ssl_openssl.cpp' unless build.without? 'openssl'
+    modules << 'm_ldapauth.cpp' unless build.without? 'ldap'
+    modules << 'm_ldapoper.cpp' unless build.without? 'ldap'
     modules << 'm_regex_pcre.cpp' if build.with? 'pcre'
+    modules << 'm_ssl_pgsql.cpp' unless build.without? 'postgres'
+    modules << 'm_sqlite3.cpp' if build.with? 'sqlite'
     modules << 'm_regex_tre.cpp' if build.with? 'tre'
 
     system './configure', "--enable-extras=#{modules.join(',')}" unless modules.empty?