diff --git a/lttng-ust-2.11.0-fix-no-common.patch b/lttng-ust-2.11.0-fix-no-common.patch
new file mode 100644
index 0000000..f288b4c
--- /dev/null
+++ b/lttng-ust-2.11.0-fix-no-common.patch
@@ -0,0 +1,22 @@
+--- a/liblttng-ust-ctl/ustctl.c
++++ b/liblttng-ust-ctl/ustctl.c
+@@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void);
+ extern void lttng_ring_buffer_client_discard_rt_exit(void);
+ extern void lttng_ring_buffer_metadata_client_exit(void);
+ 
+-volatile enum ust_loglevel ust_loglevel;
+-
+ int ustctl_release_handle(int sock, int handle)
+ {
+ 	struct ustcomm_ust_msg lum;
+--- a/liblttng-ust-fd/lttng-ust-fd.c
++++ b/liblttng-ust-fd/lttng-ust-fd.c
+@@ -28,8 +28,6 @@
+ #include <helper.h>
+ #include "usterr-signal-safe.h"
+ 
+-volatile enum ust_loglevel ust_loglevel;
+-
+ static int (*__lttng_ust_fd_plibc_close)(int fd);
+ static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream);
+ 
diff --git a/lttng-ust.changes b/lttng-ust.changes
index d68fda3..d6ba549 100644
--- a/lttng-ust.changes
+++ b/lttng-ust.changes
@@ -3,6 +3,8 @@ Wed Feb 26 14:29:32 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
 
 - Update to version 2.11.0:
   * See /usr/share/doc/packages/lttng-ust/ChangeLog
+- Add lttng-ust-2.11.0-fix-no-common.patch: Fix build with
+  -fno-common (commit 21a934df, boo#1160400).
 - Drop support for old openSUSE versions.
 
 -------------------------------------------------------------------
diff --git a/lttng-ust.spec b/lttng-ust.spec
index 85bfe53..fee041f 100644
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -28,6 +28,8 @@ URL:            https://lttng.org/
 Source:         https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2
 Source1:        https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2.asc
 Source2:        %{name}.keyring
+# PATCH-FIX-UPSTREAM lttng-ust-2.11.0-fix-no-common.patch boo#1160400 mjeanson@gmail.com -- Fix build with -fno-common (commit 21a934df).
+Patch0:         %{name}-2.11.0-fix-no-common.patch
 BuildRequires:  gcc-c++
 BuildRequires:  libnuma-devel
 BuildRequires:  liburcu-devel
@@ -104,7 +106,7 @@ This package includes documentation and examples for developing
 applications using LTTng userspace tracing.
 
 %prep
-%setup -q
+%autosetup -p1
 
 # Fix Python shebang.
 sed -i -e "1s|^#!.*$|#!%{_bindir}/python3|" tools/lttng-gen-tp