diff --git a/djvulibre-always-assume-that-cpuid-works-on-x86_64.patch b/djvulibre-always-assume-that-cpuid-works-on-x86_64.patch
new file mode 100644
index 0000000..dc77923
--- /dev/null
+++ b/djvulibre-always-assume-that-cpuid-works-on-x86_64.patch
@@ -0,0 +1,22 @@
+--- a/libdjvu/MMX.cpp
++++ b/libdjvu/MMX.cpp
+@@ -169,16 +169,10 @@
+ #endif
+ #if defined(MMX) && defined(__GNUC__) && defined(__x86_64__)
+   // Detection of MMX for GCC
+-  __asm__ volatile (// Check that CR0:EM is clear
+-                    "xorl %%edx,%%edx\n\t"
+-                    "smsw %%ax\n\t"
+-                    "andl $4,%%eax\n\t"
+-                    "jnz 1f\n\t"
+-                    // Execute CPUID
++  __asm__ volatile (// Execute CPUID
+                     "movl $1,%%eax\n\t"
+-                    "cpuid\n"
+-                    // Finish
+-		    "1:\tmovl %%edx, %0"
++                    "cpuid\n\t"
++		    "movl %%edx, %0"
+                     : "=m" (cpuflags) :
+                     : "eax","ebx","ecx","edx");
+ #endif
diff --git a/djvulibre.changes b/djvulibre.changes
index 0d81983..9f3c05a 100644
--- a/djvulibre.changes
+++ b/djvulibre.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 18 08:33:20 UTC 2019 - pgajdos@suse.com
+
+- do not segfault when mmx enabled [bsc#1154401]
+- added patches
+  https://sourceforge.net/p/djvu/bugs/293/
+  + djvulibre-always-assume-that-cpuid-works-on-x86_64.patch
+
 -------------------------------------------------------------------
 Tue Sep  3 06:21:13 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/djvulibre.spec b/djvulibre.spec
index 8a37071..8abec89 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -39,6 +39,8 @@ Patch3:         djvulibre-CVE-2019-15145.patch
 Patch4:         djvulibre-CVE-2019-15142.patch
 # do not segfault when libtiff encounters corrupted TIFF (upstream issue #295)
 Patch5:         djvulibre-invalid-tiff.patch
+# https://sourceforge.net/p/djvu/bugs/293/
+Patch6:         djvulibre-always-assume-that-cpuid-works-on-x86_64.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
@@ -91,7 +93,14 @@ software platform for distributing documents and images.
 This package contains the documentation.
 
 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure \