diff --git a/README.md b/README.md
index 92cbe3ee..5c3229e2 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,32 @@ This project is currently in beta. Most of the functionality is there, but there
 
 ### Building
 
-Delve requires Go 1.4 to build, and currently only supports Linux, with OS X support coming soon.
+Delve requires Go 1.4 to build.
 
 ```
 go get -u github.com/derekparker/delve/cmd/dlv
 ```
 
-You will need readline installed on your system. With apt simply: `sudo apt-get install libreadline-dev` .
+#### Linux
+
+You're done!
+
+#### OS X
+
+If you are on OS X a few extra steps must be taken. You must create a self signed certificate:
+
+* Open application “Keychain Access” (/Applications/Utilities/Keychain Access.app)
+* Open menu /Keychain Access/Certificate Assistant/Create a Certificate...
+* Choose a name (dlv-cert in the example), set “Identity Type” to “Self Signed Root”, set “Certificate Type” to “Code Signing” and select the “Let me override defaults”. Click “Continue”. You might want to extend the predefined 365 days period to 3650 days.
+* Click several times on “Continue” until you get to the “Specify a Location For The Certificate” screen, then set “Keychain to System”.
+* If you can't store the certificate in the “System” keychain, create it in the “login” keychain, then export it. You can then import it into the “System” keychain.
+* In keychains select “System”, and you should find your new certificate. Use the context menu for the certificate, select “Get Info”, open the “Trust” item, and set “Code Signing” to “Always Trust”.
+* You must quit “Keychain Access” application in order to use the certificate and restart “taskgated” service by killing the current running “taskgated” process. Alternatively you can restart your computer.
+
+All `make` commands assume a CERT environment variables that contains the name of the cert you created above.
+Following that you can `CERT=mycert make install` which should install the binary and codesign it. For running tests, simply run `CERT=mycert make test`.
+
+The makefile is only necessary to help facilitate the process of building and codesigning.
 
 ### Features
 
@@ -81,7 +100,6 @@ Once inside a debugging session, the following commands may be used:
 ### Upcoming features
 
 * In-scope variable setting
-* Support for OS X
 * Editor integration
 
 ### License
diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go
index 9a8ce0d1..ba83e5db 100644
--- a/cmd/dlv/main.go
+++ b/cmd/dlv/main.go
@@ -9,7 +9,7 @@ import (
 	"github.com/derekparker/delve/client/cli"
 )
 
-const version string = "0.4.0.beta"
+const version string = "0.5.0.beta"
 
 func init() {
 	// We must ensure here that we are running on the same thread during