diff --git a/Formula/haproxy.rb b/Formula/haproxy.rb
index 583c4daaf81..c64a6ff2c09 100644
--- a/Formula/haproxy.rb
+++ b/Formula/haproxy.rb
@@ -5,19 +5,27 @@ class Haproxy < Formula
   url 'http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz'
   sha1 'ed8918c950bdb5b4b96d62c23073b7972443fe94'
 
+  devel do
+    url 'http://haproxy.1wt.eu/download/1.5/src/snapshot/haproxy-ss-20120905.tar.gz'
+    sha1 '3b0e3b9358ec59a8eea35f5e649f2f824680cf33'
+  end
+
   depends_on 'pcre'
 
   def install
+    args = ["TARGET=generic",
+            "USE_KQUEUE=1",
+            "USE_POLL=1",
+            "USE_PCRE=1"]
+
+    if build.devel?
+      args << "USE_OPENSSL=1"
+      args << "ADDLIB=-lcrypto"
+    end
+
     # We build generic since the Makefile.osx doesn't appear to work
-    system "make", "TARGET=generic",
-                   "USE_KQUEUE=1",
-                   "USE_POLL=1",
-                   "USE_PCRE=1",
-                   "PREFIX=#{prefix}",
-                   "DOCDIR=#{doc}",
-                   "CC=#{ENV.cc}",
-                   "CFLAGS=#{ENV.cflags}",
-                   "LDFLAGS=#{ENV.ldflags}",
-                   "install"
+    system "make", "CC=#{ENV.cc}", "CFLAGS=#{ENV.cflags}", "LDFLAGS=#{ENV.ldflags}", *args
+    man1.install "doc/haproxy.1"
+    bin.install "haproxy"
   end
 end