diff --git a/add-neon-031-support.patch b/add-neon-031-support.patch
new file mode 100644
index 0000000..13c7d61
--- /dev/null
+++ b/add-neon-031-support.patch
@@ -0,0 +1,54 @@
+--- configure.ac.orig	2020-06-11 14:39:04.455816310 +0200
++++ configure.ac	2020-06-11 14:39:18.487895733 +0200
+@@ -36,7 +36,7 @@
+ # Checks for libraries.
+ AM_GNU_GETTEXT_VERSION(0.18.1)
+ AM_GNU_GETTEXT([external])
+-NE_REQUIRE_VERSIONS([0], [27 28 29 30])
++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
+ DAV_CHECK_NEON
+ 
+ # Checks for header files.
+
+--- configure.orig	2020-06-11 14:42:11.436874509 +0200
++++ configure	2020-06-11 14:42:48.429083847 +0200
+@@ -6800,7 +6800,7 @@
+ $as_echo "$ne_cv_lib_neon" >&6; }
+     if test "$ne_cv_lib_neon" = "yes"; then
+        ne_cv_lib_neonver=no
+-       for v in 27 28 29 30; do
++       for v in 27 28 29 30 31; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
+@@ -6983,8 +6983,8 @@
+     neon_got_library=yes
+ 
+ else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5
+-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5
++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;}
+     neon_got_library=no
+ fi
+ 
+@@ -7040,7 +7040,7 @@
+ $as_echo "$ne_cv_lib_neon" >&6; }
+     if test "$ne_cv_lib_neon" = "yes"; then
+        ne_cv_lib_neonver=no
+-       for v in 27 28 29 30; do
++       for v in 27 28 29 30 31; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
+@@ -7223,8 +7223,8 @@
+     neon_got_library=yes
+ 
+ else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5
+-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5
++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;}
+     neon_got_library=no
+ fi
+ 
diff --git a/davfs2.changes b/davfs2.changes
index 5df13ae..90d0824 100644
--- a/davfs2.changes
+++ b/davfs2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 11 12:45:49 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Add add-neon-031-support.patch
+- Add -fcommon to allow building against GCC10
+
 -------------------------------------------------------------------
 Tue May  5 11:11:15 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/davfs2.spec b/davfs2.spec
index f09b152..579e398 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -27,7 +27,10 @@ Source0:        http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{v
 Source1:        http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz.sig
 Source2:        %{name}-rpmlintrc
 Source3:        memberlist-gpgkeys.gpg
+# Partially taken from https://savannah.nongnu.org/bugs/?58101, won't be needed with next version update
+Patch0:         add-neon-031-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  automake >= 1.16
 BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  neon-devel
 BuildRequires:  pwdutils
@@ -48,6 +51,7 @@ supporting TLS/SSL and access via proxy servers.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 cd src
 
 %build
@@ -60,7 +64,7 @@ dav_group="%{name}" \
 PIE="-fPIE"
 pie="-pie"
 %endif
-make AM_CFLAGS="-Wall %{optflags} $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags}
+make AM_CFLAGS="-Wall %{optflags} $PIE -fcommon" AM_LDFLAGS="$pie" %{?_smp_mflags}
 
 %install
 %make_install