diff --git a/packages/neon.rb b/packages/neon.rb
index fb6625374..3457ebb71 100644
--- a/packages/neon.rb
+++ b/packages/neon.rb
@@ -3,37 +3,41 @@ require 'package'
 class Neon < Package
   description 'neon is an HTTP and WebDAV client library, with a C interface.'
   homepage 'http://www.webdav.org/neon/'
-  version '0.30.2'
+  version '0.31.2'
   license 'GPL-2'
   compatibility 'all'
-  source_url 'http://www.webdav.org/neon/neon-0.30.2.tar.gz'
-  source_sha256 'db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca'
+  source_url 'https://github.com/notroj/neon.git'
+  git_hashtag version
 
-  binary_url ({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.30.2_armv7l/neon-0.30.2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.30.2_armv7l/neon-0.30.2-chromeos-armv7l.tar.xz',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.30.2_i686/neon-0.30.2-chromeos-i686.tar.xz',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.30.2_x86_64/neon-0.30.2-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.31.2_armv7l/neon-0.31.2-chromeos-armv7l.tpxz',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.31.2_armv7l/neon-0.31.2-chromeos-armv7l.tpxz',
+       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.31.2_i686/neon-0.31.2-chromeos-i686.tar.xz',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/neon/0.31.2_x86_64/neon-0.31.2-chromeos-x86_64.tpxz'
   })
-  binary_sha256 ({
-    aarch64: '788d09916ce56e217297af5f3e3ce86d131ab05be0f54f85bf24f86a85701989',
-     armv7l: '788d09916ce56e217297af5f3e3ce86d131ab05be0f54f85bf24f86a85701989',
-       i686: 'a6777a6aa2be12f78be08c1af13ec49116d44b0c0f2fe892dd8ebd443f6b26e6',
-     x86_64: '6ced539e58a179d141a242cea0a265a1d1897320346694639d192b5a83c1d59c',
+  binary_sha256({
+    aarch64: '8da405951069b5143951dc15799a5367d8e5b752e85c31bc39b22ec32a40dcb7',
+     armv7l: '8da405951069b5143951dc15799a5367d8e5b752e85c31bc39b22ec32a40dcb7',
+       i686: '867d746b9bc058663a53258b6326199f4c6868c11f96cf03d8d9b4538d1b2b5a',
+     x86_64: 'cee9c8e0ace8b92c29bfb0f9e4592b93ba31f9fcfc5f0ad52910bb0b71d2f44b'
   })
 
+  depends_on 'xmlto' => :build
+
   def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--enable-shared=yes',
-           '--enable-static=no',
-           '--with-ssl=openssl'
+    system './autogen.sh'
+    system 'filefix'
+    system "#{CREW_ENV_OPTIONS} ./configure \
+            #{CREW_OPTIONS} \
+           --enable-shared=yes \
+           --with-ssl=openssl"
     system 'make'
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-    FileUtils.ln_s "#{CREW_LIB_PREFIX}/libneon.so", "#{CREW_DEST_LIB_PREFIX}/neon.so"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install-lib', 'install-headers', 'install-config'
+    Dir.chdir(CREW_DEST_LIB_PREFIX) do
+      FileUtils.ln_s "#{CREW_LIB_PREFIX}/libneon.so", 'neon.so'
+    end
   end
 end