diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 7de2e51..1f26210 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 23 13:19:41 UTC 2018 - sndirsch@suse.com
+
+- redone u_add_llvm_codegen_dependencies.patch and renamed to
+  u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
+  (boo#1082307)
+
 -------------------------------------------------------------------
 Fri Feb 23 13:03:51 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index e5922b1..96b5c6b 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -133,7 +133,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
+Patch12:        u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
 # never to be upstreamed
 Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 # currently needed for libglvnd support
diff --git a/Mesa.changes b/Mesa.changes
index 7de2e51..1f26210 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 23 13:19:41 UTC 2018 - sndirsch@suse.com
+
+- redone u_add_llvm_codegen_dependencies.patch and renamed to
+  u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
+  (boo#1082307)
+
 -------------------------------------------------------------------
 Fri Feb 23 13:03:51 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 3c1116f..0315b58 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -132,7 +132,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
+Patch12:        u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
 # never to be upstreamed
 Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 # currently needed for libglvnd support
diff --git a/u_add_llvm_codegen_dependencies.patch b/u_add_llvm_codegen_dependencies.patch
deleted file mode 100644
index 1123b79..0000000
--- a/u_add_llvm_codegen_dependencies.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
diff --git a/u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch b/u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
new file mode 100644
index 0000000..fed6afb
--- /dev/null
+++ b/u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch
@@ -0,0 +1,27 @@
+From 1431fecda9cd4c38eecb6bdc172a7af9ff72c056 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Fri, 23 Feb 2018 14:15:19 +0100
+Subject: [PATCH] configure.ac: Link to libLLVMCodegen to fix cyclic linking
+ problems
+
+Patch by "Ismail Doenmez" <idonmez@suse.com>
+https://bugzilla.suse.com/show_bug.cgi?id=1082307
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 8a9172690a..a23eb844d4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1032,6 +1032,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
+-- 
+2.13.6
+