Index: ocurl/Makefile.in
===================================================================
--- ocurl.orig/Makefile.in
+++ ocurl/Makefile.in
@@ -27,7 +27,7 @@ CURLHELPEROBJS	= curl-helper.o
 CURLOBJS	= curl.cmx
 CURLBCOBJS	= $(CURLOBJS:.cmx=.cmo)
 
-CURLFLAGS	= -ccopt @CURLFLAGS@
+CURLFLAGS	= -ccopt "-I. @CURLFLAGS@"
 CURLCLIBS	= -cclib -lcurl-helper -cclib "@CURLLIBS@"
 
 ifeq (@OCAMLBEST@,opt)
Index: ocurl/configure.in
===================================================================
--- ocurl.orig/configure.in
+++ ocurl/configure.in
@@ -5,8 +5,8 @@ dnl
 AC_INIT(curl.ml)
 
 CURLDIR=`curl-config --cflags`
-CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1`
-CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-`
+CURLFLAGS=`curl-config --cflags`
+CURLLIBS=`curl-config --libs`
 
 CFLAGS=$CURLDIR