diff --git a/ChangeLog b/ChangeLog
index eb5e0966fa..64c42ad52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-19  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Fix check so that future libneon API changes won't break the build.
+
+	* ext/neon/gstneonhttpsrc.c:
+	  Fix build with libneon-0.26.x (#345182).
+
 2006-06-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8d267d237b..7e731092e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,7 +564,7 @@ GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz tag generation], musicbrainz, [
 dnl *** neon ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_NEON, true)
 GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [
-  PKG_CHECK_MODULES(NEON, neon >= 0.25.5, HAVE_NEON="yes", [
+  PKG_CHECK_MODULES(NEON, neon >= 0.25.5  neon <= 0.26.99, HAVE_NEON="yes", [
     HAVE_NEON="no"
     AC_MSG_RESULT(no)
   ])
diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c
index 356da9a01d..98da82343b 100644
--- a/ext/neon/gstneonhttpsrc.c
+++ b/ext/neon/gstneonhttpsrc.c
@@ -20,6 +20,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef NE_FREE
+#define NEON_026_OR_LATER  1
+#endif
+
 #define HTTP_DEFAULT_HOST        "localhost"
 #define HTTP_DEFAULT_PORT        80
 #define HTTPS_DEFAULT_PORT       443
@@ -626,10 +630,13 @@ set_proxy (const char *uri, ne_uri * parsed, gboolean set_default)
   if (parsed->host && !parsed->port) {
     goto clear;
   }
-
-  if (!parsed->path || parsed->authinfo) {
+#ifdef NEON_026_OR_LATER
+  if (!parsed->path || parsed->userinfo)
     goto clear;
-  }
+#else
+  if (!parsed->path || parsed->authinfo)
+    goto clear;
+#endif
 
   return TRUE;