diff --git a/jflex-bootstrap.changes b/jflex-bootstrap.changes
index a64c8b1..26a7c70 100644
--- a/jflex-bootstrap.changes
+++ b/jflex-bootstrap.changes
@@ -1,5 +1,16 @@
 -------------------------------------------------------------------
-Mon Sep  9 11:32:01 UTC 2013 - tchvatal@suse.com
+Mon Dec  2 12:44:30 UTC 2013 - mvyskocil@suse.com
+
+- conflicts with non-bootstrap variant
+
+-------------------------------------------------------------------
+Thu Nov 14 12:31:24 UTC 2013 - mvyskocil@suse.com
+
+- Fix build with junit 4
+  * jflex-junit4.patch
+
+-------------------------------------------------------------------
+Mon Sep  9 11:06:00 UTC 2013 - tchvatal@suse.com
 
 - Move from jpackage-utils to javapackage-tools
 
diff --git a/jflex-junit4.patch b/jflex-junit4.patch
new file mode 100644
index 0000000..ad2a1fd
--- /dev/null
+++ b/jflex-junit4.patch
@@ -0,0 +1,13 @@
+Index: jflex-1.4.3/src/JFlex/tests/AllTests.java
+===================================================================
+--- jflex-1.4.3.orig/src/JFlex/tests/AllTests.java
++++ jflex-1.4.3/src/JFlex/tests/AllTests.java
+@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
+ public class AllTests {
+ 
+   public static void main(String[] args) {
+-    junit.textui.TestRunner.run(AllTests.class);
++    //junit.textui.TestRunner.run(AllTests.class);
+   }
+ 
+   public static Test suite() {
diff --git a/jflex.changes b/jflex.changes
index 5fc83fb..6570508 100644
--- a/jflex.changes
+++ b/jflex.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec  2 12:44:19 UTC 2013 - mvyskocil@suse.com
+
+- conflicts with bootstrap variant
+
+-------------------------------------------------------------------
+Thu Nov 14 12:31:24 UTC 2013 - mvyskocil@suse.com
+
+- Fix build with junit 4
+  * jflex-junit4.patch
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:00 UTC 2013 - tchvatal@suse.com
 
diff --git a/jflex.spec b/jflex.spec
index 9ef09dc..309f5fe 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -42,6 +42,8 @@ Patch1:         jflex-no-cup-no-jflex.patch
 Patch2:         jflex-classpath.patch
 Patch3:         jflex-lex-scan.patch
 Patch4:         jflex-byaccj-utl.patch
+#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with junit 4
+Patch5:         jflex-junit4.patch
 Requires:       java_cup
 Requires:       javapackages-tools
 BuildRequires:  ant
@@ -49,6 +51,9 @@ BuildRequires:  java-cup-bootstrap
 %if %without bootstrap
 BuildRequires:  jflex-bootstrap
 BuildRequires:  junit
+Conflicts:      jflex-bootstrap
+%else
+Conflicts:      jflex
 %endif
 BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildArch:      noarch
@@ -119,6 +124,7 @@ rm -rf src/JFlex/tests
 #%patch3 -p1
 %patch4 -p1
 %endif
+%patch5 -p1
 
 %build
 pushd src