diff --git a/glusterfs-7.0.tar.gz b/glusterfs-7.0.tar.gz
deleted file mode 100644
index d8a250c..0000000
--- a/glusterfs-7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a872518bf9bd4dc1568f45c716bcde09e3bf7abf5b156ea90405e0fc2e9f07b
-size 7610837
diff --git a/glusterfs-7.1.tar.gz b/glusterfs-7.1.tar.gz
new file mode 100644
index 0000000..a516e62
--- /dev/null
+++ b/glusterfs-7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffc5bd78b079009382bd01391865646bc9b2e8e72366afc96d62ba891dd9dbce
+size 7629250
diff --git a/glusterfs.changes b/glusterfs.changes
index ca06b4c..0a7f47e 100644
--- a/glusterfs.changes
+++ b/glusterfs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jan  9 15:30:24 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.1
+  * Fix rebalance causing IO Error - File descriptor in bad state
+  * Fix geo-replication sessions going faulty
+  * Fix memory leak in glusterfsd process
+  * Fix GlusterFS brick process crash
+- Add nocommon.patch [boo#1160392]
+
 -------------------------------------------------------------------
 Thu Dec 26 08:22:55 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
 
diff --git a/glusterfs.spec b/glusterfs.spec
index 0d5ad76..edfeb7e 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package glusterfs
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,17 @@
 
 
 Name:           glusterfs
-Version:        7.0
+Version:        7.1
 Release:        0
 Summary:        Aggregating distributed file system
 License:        GPL-2.0-only OR LGPL-3.0-or-later
 Group:          System/Filesystems
 URL:            http://www.gluster.org/
 
-#Git-Clone:	git://github.com/gluster/glusterfs
-#Git-Clone:	git://github.com/fvzwieten/lsgvt
-Source:         https://download.gluster.org/pub/gluster/glusterfs/7/7.0/glusterfs-7.0.tar.gz
+#Git-Clone:	https://github.com/gluster/glusterfs
+#Git-Clone:	https://github.com/fvzwieten/lsgvt
+Source:         https://download.gluster.org/pub/gluster/glusterfs/7/7.1/glusterfs-7.1.tar.gz
+Patch1:         nocommon.patch
 BuildRequires:  acl-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -135,16 +136,13 @@ This package provides development files such as headers and library
 links.
 
 %prep
-%setup -q
-#%patch -P 2 -p1
+%autosetup -p1
 >contrib/sunrpc/xdr_sizeof.c
 
 %build
-%define _lto_cflags %{nil}
+%define _lto_cflags %nil
 ./autogen.sh
-%configure \
-    --disable-static \
-    --disable-silent-rules
+%configure --disable-static CFLAGS="-O0 -ggdb3 -fno-common"
 make %{?_smp_mflags} V=0
 find . -name 'xdr_sizeof*' -type f -exec ls -lgo {} + || :
 
diff --git a/nocommon.patch b/nocommon.patch
new file mode 100644
index 0000000..38a8c07
--- /dev/null
+++ b/nocommon.patch
@@ -0,0 +1,33 @@
+References: https://bugzilla.suse.com/show_bug.cgi?id=1160382
+---
+ cli/src/cli.c |    1 +
+ cli/src/cli.h |    4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+Index: glusterfs-7.1/cli/src/cli.c
+===================================================================
+--- glusterfs-7.1.orig/cli/src/cli.c
++++ glusterfs-7.1/cli/src/cli.c
+@@ -61,6 +61,7 @@
+ 
+ #include "xdr-generic.h"
+ 
++int cli_default_conn_timeout, cli_ten_minutes_timeout;
+ extern int connected;
+ /* using argp for command line parsing */
+ 
+Index: glusterfs-7.1/cli/src/cli.h
+===================================================================
+--- glusterfs-7.1.orig/cli/src/cli.h
++++ glusterfs-7.1/cli/src/cli.h
+@@ -39,8 +39,8 @@ enum argp_option_keys {
+     ARGP_PORT_KEY = 'p',
+ };
+ 
+-int cli_default_conn_timeout;
+-int cli_ten_minutes_timeout;
++extern int cli_default_conn_timeout;
++extern int cli_ten_minutes_timeout;
+ 
+ typedef enum {
+     COLD_BRICK_COUNT,