diff --git a/Mesa.changes b/Mesa.changes
index a4c3f76..a45b4a7 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 20 13:16:22 UTC 2017 - idonmez@suse.com
+
+- Add u_add_llvm_codegen_dependencies.patch to link to
+  libLLVMCodegen to fix cyclic linking problems. bsc#981975
+
 -------------------------------------------------------------------
 Tue Apr 18 21:33:50 UTC 2017 - afaerber@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 85bb981..b4fbcf0 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -72,6 +72,7 @@ Source6:        %{name}-rpmlintrc
 Source7:        Mesa.keyring
 # to be upstreamed
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
+Patch12:        u_add_llvm_codegen_dependencies.patch
 # Patch from Fedora, fix 16bpp in llvmpipe
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
@@ -648,6 +649,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch11 -p1
 #%patch15 -p1
 #%patch13 -p1
+%patch12 -p1
 %patch18 -p1
 %patch21 -p1
 
diff --git a/u_add_llvm_codegen_dependencies.patch b/u_add_llvm_codegen_dependencies.patch
new file mode 100644
index 0000000..1123b79
--- /dev/null
+++ b/u_add_llvm_codegen_dependencies.patch
@@ -0,0 +1,12 @@
+Index: mesa-17.0.4/configure.ac
+===================================================================
+--- mesa-17.0.4.orig/configure.ac
++++ mesa-17.0.4/configure.ac
+@@ -918,6 +918,7 @@ llvm_add_default_components() {
+ 
+     # Required default components
+     llvm_add_component "bitwriter" $driver_name
++    llvm_add_component "codegen" $driver_name
+     llvm_add_component "engine" $driver_name
+     llvm_add_component "mcdisassembler" $driver_name
+     llvm_add_component "mcjit" $driver_name