diff --git a/couchapp b/couchapp
index a0ecb4a9..1d85bf18 100755
Binary files a/couchapp and b/couchapp differ
diff --git a/rebar.config b/rebar.config
index 00b9a0ea..49ff97ce 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,10 @@
 %%-*- mode: erlang -*-
 
 %% Erlang compiler options
-{erl_opts, [{i, "include"}, debug]}.
+{erl_opts, [{i, "include"}, 
+            {i, "deps/ibrowse/src/"},
+            {i, "deps/couchbeam/include"},
+            debug]}.
 
 {app_bin, ["priv/couchapp"]}.
 
diff --git a/src/couchapp_push.erl b/src/couchapp_push.erl
index 32433200..ab112e1d 100644
--- a/src/couchapp_push.erl
+++ b/src/couchapp_push.erl
@@ -9,7 +9,7 @@
 
 -include_lib("kernel/include/file.hrl").
 -include("couchapp.hrl").
--include("deps/couchbeam/include/couchbeam.hrl").
+-include("couchbeam.hrl").
 
 -export([push/2]).
 
diff --git a/src/couchapp_util.erl b/src/couchapp_util.erl
index 64056d53..28afbdb9 100644
--- a/src/couchapp_util.erl
+++ b/src/couchapp_util.erl
@@ -5,7 +5,7 @@
 
 -module(couchapp_util).
 
--include("deps/ibrowse/src/ibrowse.hrl").
+-include("ibrowse.hrl").
 -include("couchapp.hrl").
 
 -define(BLOCKSIZE, 32768).
@@ -45,8 +45,9 @@ db_from_string(DbString) ->
             DbString
     end,
     Url = ibrowse_lib:parse_url(DbUrl),
-    Server = couchbeam:server_connection(Url#url.host, Url#url.port),
 
+    Server = couchbeam:server_connection(Url#url.host, Url#url.port),
+    
     Options = case Url#url.username of
         undefined -> [];
         Username ->