diff --git a/net-libs/neon/neon-0.29.6.recipe b/net-libs/neon/neon-0.29.6.recipe
deleted file mode 100644
index 69770b362..000000000
--- a/net-libs/neon/neon-0.29.6.recipe
+++ /dev/null
@@ -1,105 +0,0 @@
-SUMMARY="HTTP and WebDAV client library, with a C interface"
-DESCRIPTION="
-neon is an HTTP and WebDAV client library, with a C interface. Features:
-- high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, \
-DELETE, etc)
-- low-level interface to the HTTP request/response engine, allowing the use of \
-arbitrary HTTP methods, headers, etc.
-- authentication support including Basic and Digest support, along with \
-GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32
-- SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer for \
-verifying server certificates, handling client certificates, and examining \
-certificate properties. Smartcard-based client certificates are also supported \
-via a PKCS#11 wrapper interface.
-- abstract interface to parsing XML using libxml2 or expat, and wrappers for \
-simplifying handling XML HTTP response bodies
-- WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify \
-property manipulation.
-"
-HOMEPAGE="https://web.archive.org/web/20170923042221/http://webdav.org:80/neon/"
-COPYRIGHT="1999-2011 Joe Orton"
-LICENSE="GNU LGPL v2"
-REVISION="12"
-SOURCE_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz"
-CHECKSUM_SHA256="9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43"
-PATCHES="neon-0.29.6.patch"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	neon$secondaryArchSuffix = $portVersion compat >= 0.29
-	libneon$secondaryArchSuffix = 27.2.6 compat >= 27.2
-	lib:libneon$secondaryArchSuffix = 27.2.6 compat >= 27.2
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:libncurses$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29
-	libneon${secondaryArchSuffix}_devel = 27.2.6 compat >= 27
-	cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29
-	devel:libneon$secondaryArchSuffix = 27.2.6 compat >= 27
-	"
-REQUIRES_devel="
-	neon$secondaryArchSuffix == $portVersion base
-	libneon$secondaryArchSuffix == 27.2.6
-	"
-
-BUILD_REQUIRES="
-	devel:libcrypto$secondaryArchSuffix
-	devel:libncurses$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix >= 2.7.8
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	"
-
-BUILD()
-{
-	echo 'LT_INIT' >> configure.in
-	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in
-	./autogen.sh
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	./autogen.sh
-	libtoolize --force --copy --install
-	aclocal -I macros
-	autoconf
-	runConfigure ./configure \
-		--with-ssl \
-		--with-libxml2 \
-		--enable-shared \
-		--disable-nls
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	prepareInstalledDevelLibs libneon
-	fixDevelopLibDirReferences $binDir/neon-config
-	fixPkgconfig
-
-	# devel package
-	packageEntries devel \
-		$binDir/neon-config \
-		$developDir \
-		$documentationDir
-}
diff --git a/net-libs/neon/neon-0.30.2.recipe b/net-libs/neon/neon-0.31.1.recipe
similarity index 78%
rename from net-libs/neon/neon-0.30.2.recipe
rename to net-libs/neon/neon-0.31.1.recipe
index e5333c18a..80fb91524 100644
--- a/net-libs/neon/neon-0.30.2.recipe
+++ b/net-libs/neon/neon-0.31.1.recipe
@@ -16,20 +16,24 @@ via a PKCS#11 wrapper interface.
 simplify handling XML HTTP response bodies.
 - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify \
 property manipulation."
-HOMEPAGE="https://web.archive.org/web/20170928175008/http://www.webdav.org/neon/"
-COPYRIGHT="1999-2011 Joe Orton"
+HOMEPAGE="https://notroj.github.io/neon/
+	https://github.com/notroj/neon"
+COPYRIGHT="1999-2006 Joe Orton and others"
 LICENSE="GNU LGPL v2"
-REVISION="11"
-SOURCE_URI="https://fossies.org/linux/www/neon-$portVersion.tar.gz"
-CHECKSUM_SHA256="db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
+REVISION="1"
+SOURCE_URI="https://notroj.github.io/neon/neon-$portVersion.tar.gz"
+CHECKSUM_SHA256="c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"
 PATCHES="neon-0.29.6.patch"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="27.4.1"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	neon$secondaryArchSuffix = $portVersion compat >= 0.29
-	lib:libneon$secondaryArchSuffix = 27.3.1 compat >= 27.3
+	lib:libneon$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -43,7 +47,7 @@ REQUIRES="
 PROVIDES_devel="
 	neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29
 	cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29
-	devel:libneon$secondaryArchSuffix = 27.3.1 compat >= 27.3
+	devel:libneon$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	neon$secondaryArchSuffix == $portVersion base
@@ -67,18 +71,14 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage neon$secondaryArchSuffix \
+	"$libDir"/libneon.so.$libVersion
+
 BUILD()
 {
-	echo 'LT_INIT' >> configure.in
-	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in
+	echo 'LT_INIT' >> configure.ac
+	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.ac
 	./autogen.sh
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	./autogen.sh
-	libtoolize --force --copy --install
-	aclocal -I macros
-	autoconf
 	runConfigure ./configure \
 		--with-ssl=openssl \
 		--with-libxml2 \
@@ -93,7 +93,7 @@ INSTALL()
 
 	rm $libDir/libneon.la
 
-	prepareInstalledDevelLibs libneon
+	prepareInstalledDevelLib libneon
 	fixDevelopLibDirReferences $binDir/neon-config
 	fixPkgconfig