diff --git a/Formula/imap-uw.rb b/Formula/imap-uw.rb
index 2c6f19079e..f609c738df 100644
--- a/Formula/imap-uw.rb
+++ b/Formula/imap-uw.rb
@@ -6,15 +6,20 @@ class ImapUw < Formula
   mirror 'http://ftp.ntua.gr/pub/net/mail/imap/imap-2007f.tar.gz'
   sha1 '7a82ebd5aae57a5dede96ac4923b63f850ff4fa7'
 
-  patch :p0 do
-    url "https://trac.macports.org/export/63088/trunk/dports/mail/imap-uw/files/patch-snowleopard.diff"
-    sha1 "03dec6527fc6b21be6eddc2a38cb93f11fe65bd6"
-  end if MacOS.version >= :snow_leopard
+  depends_on "openssl"
 
   def install
     ENV.j1
-
-    system 'make oxp'
+    inreplace "Makefile" do |s|
+      s.gsub! "SSLINCLUDE=/usr/include/openssl",
+              "SSLINCLUDE=#{Formula["openssl"].opt_include}/openssl"
+      s.gsub! "SSLLIB=/usr/lib",
+              "SSLLIB=#{Formula["openssl"].opt_lib}"
+      s.gsub! "-DMAC_OSX_KLUDGE=1", "" if MacOS.version >= :snow_leopard
+    end
+    inreplace "src/osdep/unix/ssl_unix.c", "#include <x509v3.h>\n#include <ssl.h>",
+                                           "#include <ssl.h>\n#include <x509v3.h>"
+    system "make", "oxp"
 
     # email servers:
     sbin.install 'imapd/imapd', 'ipopd/ipop2d', 'ipopd/ipop3d'