diff -ur orig/apr-util-1.5.3/build/apu-conf.m4 apr_util-1.5.3/build/apu-conf.m4
--- orig/apr-util-1.5.3/build/apu-conf.m4	2011-08-08 11:32:27.026738688 +0200
+++ apr_util-1.5.3/build/apu-conf.m4	2013-04-30 21:28:37.100401152 +0200
@@ -145,10 +145,10 @@
   else
     # Add given path to standard search paths if appropriate:
     if test "$withval" != "/usr"; then
-      APR_ADDTO(LDFLAGS, [-L$withval/lib])
-      APR_ADDTO(CPPFLAGS, [-I$withval/include])
-      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
+      APR_ADDTO(LDFLAGS, [-L$withval/develop/lib])
+      APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers])
+      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers])
+      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib])
     fi
     # ...and refuse to fall back on the builtin expat.
     apu_try_builtin_expat=0
diff -ur orig/apr-util-1.5.3/config.layout apr_util-1.5.3/config.layout
--- orig/apr-util-1.5.3/config.layout	2005-02-09 13:18:43.064749568 +0100
+++ apr_util-1.5.3/config.layout	2013-04-30 21:27:27.079953920 +0200
@@ -60,6 +60,23 @@
     runtimedir:    ${localstatedir}/run
 </Layout>
 
+#	Haiku Layout making use of finddir
+<Layout haiku>
+    prefix:        /boot/system
+    exec_prefix:   /boot/system
+    bindir:        /boot/system/bin
+    sbindir:       /boot/system/servers
+    libdir:        /boot/system/lib
+    libexecdir:    /boot/system/servers
+    mandir:        /boot/system/documentation/man
+    sysconfdir:    /boot/system/settings
+    datadir:       /boot/system/data
+    installbuilddir: /boot/system/develop/build
+    includedir:    /boot/system/include
+    localstatedir: /boot/system/var
+    runtimedir:    ${localstatedir}/log
+</Layout>
+
 #   Mac OS X Server (Rhapsody)
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer