diff -ur bmpx-0.20.2.orig/configure bmpx-0.20.2/configure
--- bmpx-0.20.2.orig/configure	2006-07-10 07:39:39.000000000 +0300
+++ bmpx-0.20.2/configure	2006-07-19 16:21:04.000000000 +0300
@@ -34333,12 +34333,12 @@
 
 if test -n "$PKG_CONFIG"; then
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"neon < 0.26\"") >&5
-  ($PKG_CONFIG --exists --print-errors "neon < 0.26") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"neon < 0.27\"") >&5
+  ($PKG_CONFIG --exists --print-errors "neon < 0.27") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NEON_CFLAGS=`$PKG_CONFIG --cflags "neon < 0.26" 2>/dev/null`
+  pkg_cv_NEON_CFLAGS=`$PKG_CONFIG --cflags "neon < 0.27" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -34347,12 +34347,12 @@
 fi
 if test -n "$PKG_CONFIG"; then
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"neon < 0.26\"") >&5
-  ($PKG_CONFIG --exists --print-errors "neon < 0.26") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"neon < 0.27\"") >&5
+  ($PKG_CONFIG --exists --print-errors "neon < 0.27") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NEON_LIBS=`$PKG_CONFIG --libs "neon < 0.26" 2>/dev/null`
+  pkg_cv_NEON_LIBS=`$PKG_CONFIG --libs "neon < 0.27" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -34361,18 +34361,18 @@
 fi
 
 if test $pkg_failed = yes; then
-	NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon < 0.26"`
+	NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon < 0.27"`
 	# Put the nasty error message in config.log where it belongs
 	echo "$NEON_PKG_ERRORS" 1>&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (neon < 0.26) were not met.
+	{ { echo "$as_me:$LINENO: error: Package requirements (neon < 0.27) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
 Alternatively you may set the NEON_CFLAGS and NEON_LIBS environment variables
 to avoid the need to call pkg-config.  See the pkg-config man page for
 more details." >&5
-echo "$as_me: error: Package requirements (neon < 0.26) were not met.
+echo "$as_me: error: Package requirements (neon < 0.27) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
diff -ur bmpx-0.20.2.orig/plugins/vfs/transport/bmp_ne_private.h bmpx-0.20.2/plugins/vfs/transport/bmp_ne_private.h
--- bmpx-0.20.2.orig/plugins/vfs/transport/bmp_ne_private.h	2006-07-10 07:16:29.000000000 +0300
+++ bmpx-0.20.2/plugins/vfs/transport/bmp_ne_private.h	2006-07-19 16:18:48.000000000 +0300
@@ -1,6 +1,7 @@
 #ifndef BMP_NE_PRIVATE_H
 #define BMP_NE_PRIVATE_H
 
+#ifndef NEON_026
 struct host_info {
     char *hostname;
     unsigned int port;
@@ -62,4 +63,71 @@
 
     char *user_agent; /* full User-Agent: header field */
 };
+
+#else
+
+struct host_info {
+    char *hostname;
+    unsigned int port;
+    ne_sock_addr *address; /* if non-NULL, result of resolving 'hostname'. */
+    /* current network address obtained from 'address' being used. */
+    const ne_inet_addr *current;
+    char *hostport; /* URI hostport segment */
+};
+
+/* Store every registered callback in a generic container, and cast
+ * the function pointer when calling it.  */
+struct hook {
+    void (*fn)(void);
+    void *userdata;
+    const char *id; /* non-NULL for accessors. */
+    struct hook *next;
+};
+
+#define HAVE_HOOK(st,func) (st->hook->hooks->func != NULL)
+#define HOOK_FUNC(st, func) (*st->hook->hooks->func)
+
+/* Session support. */
+struct ne_session_s {
+    /* Connection information */
+    ne_socket *socket;
+
+    /* non-zero if connection has been established. */
+    int connected;
+    
+    /* non-zero if connection has persisted beyond one request. */
+    int persisted;
+
+    int is_http11; /* >0 if connected server is known to be
+		    * HTTP/1.1 compliant. */
+
+    char *scheme;
+    struct host_info server, proxy;
+
+    /* application-provided address list */
+    const ne_inet_addr **addrlist;
+    size_t numaddrs, curaddr;
+
+    /* Settings */
+    int use_proxy; /* do we have a proxy server? */
+    int use_ssl; /* whether a secure connection is required */
+    int in_connect; /* doing a proxy CONNECT */
+
+    int flags[NE_SESSFLAG_LAST];
+
+    ne_progress progress_cb;
+    void *progress_ud;
+
+    ne_notify_status notify_cb;
+    void *notify_ud;
+
+    int rdtimeout; /* read timeout. */
+
+    struct hook *create_req_hooks, *pre_send_hooks, *post_send_hooks;
+    struct hook *destroy_req_hooks, *destroy_sess_hooks, *priv;
+
+    char *user_agent; /* full User-Agent: header field */
+
+};
+#endif
 #endif
diff -ur bmpx-0.20.2.orig/plugins/vfs/transport/libtransport_http.cpp bmpx-0.20.2/plugins/vfs/transport/libtransport_http.cpp
--- bmpx-0.20.2.orig/plugins/vfs/transport/libtransport_http.cpp	2006-07-10 07:16:29.000000000 +0300
+++ bmpx-0.20.2/plugins/vfs/transport/libtransport_http.cpp	2006-07-19 16:19:02.000000000 +0300
@@ -39,6 +39,10 @@
 #include <src/uri++.hpp>
 #include <src/vfs.hpp>
 
+#ifndef NE_FREE
+#  define NEON_026 1
+#endif
+
 #include "bmp_ne_private.h"
 
 namespace