diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 8839f8a..702dc79 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 23 12:01:29 UTC 2018 - sndirsch@suse.com
+
+- recreated u_mesa-python3-only.patch and renamed to
+  u_r600-egd_tables.py-added-support-for-python-3.patch; also
+  removed first hunk (boo#1082303)
+
 -------------------------------------------------------------------
 Fri Feb 23 10:51:04 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index 472c564..7f19fd0 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -144,7 +144,7 @@ Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 # Upstream
-Patch43:        u_mesa-python3-only.patch
+Patch43:        u_r600-egd_tables.py-added-support-for-python-3.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
 Patch46:        u_glsl-linker-error.patch
 
diff --git a/Mesa.changes b/Mesa.changes
index 8839f8a..702dc79 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 23 12:01:29 UTC 2018 - sndirsch@suse.com
+
+- recreated u_mesa-python3-only.patch and renamed to
+  u_r600-egd_tables.py-added-support-for-python-3.patch; also
+  removed first hunk (boo#1082303)
+
 -------------------------------------------------------------------
 Fri Feb 23 10:51:04 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 31b0c99..68bbcc2 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -143,7 +143,7 @@ Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 # Upstream
-Patch43:        u_mesa-python3-only.patch
+Patch43:        u_r600-egd_tables.py-added-support-for-python-3.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
 Patch46:        u_glsl-linker-error.patch
 
diff --git a/u_mesa-python3-only.patch b/u_r600-egd_tables.py-added-support-for-python-3.patch
similarity index 85%
rename from u_mesa-python3-only.patch
rename to u_r600-egd_tables.py-added-support-for-python-3.patch
index a6a96f8..3a514c1 100644
--- a/u_mesa-python3-only.patch
+++ b/u_r600-egd_tables.py-added-support-for-python-3.patch
@@ -1,13 +1,21 @@
+From c1714e8bf49fc0034c91ffed4adfbb067dbdf856 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Fri, 23 Feb 2018 12:46:18 +0100
+Subject: [PATCH] r600/egd_tables.py: added support for python 3
+
+Patch by "Tomas Chvatal" <tchvatal@suse.com> with modifications
+by "Michal Srb" <msrb@suse.com> to not break python 2.
+https://bugzilla.suse.com/show_bug.cgi?id=1082303
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+---
+ src/gallium/drivers/r600/egd_tables.py | 52 +++++++++++++++++-----------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
 diff --git a/src/gallium/drivers/r600/egd_tables.py b/src/gallium/drivers/r600/egd_tables.py
-index d7b78c7fb1..7bda44ce83 100644
+index d7b78c7fb1..b3b8b50292 100644
 --- a/src/gallium/drivers/r600/egd_tables.py
 +++ b/src/gallium/drivers/r600/egd_tables.py
-@@ -1,4 +1,4 @@
--
-+#!/usr/bin/python3
- CopyRight = '''
- /*
-  * Copyright 2015 Advanced Micro Devices, Inc.
 @@ -60,7 +60,7 @@ class StringTable:
          """
          fragments = [
@@ -109,3 +117,6 @@ index d7b78c7fb1..7bda44ce83 100644
  
  
  def main():
+-- 
+2.13.6
+