diff --git a/geronimo-specs.changes b/geronimo-specs.changes
index dc8931b..dca9219 100644
--- a/geronimo-specs.changes
+++ b/geronimo-specs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  1 10:58:58 CET 2008 - mvyskocil@suse.cz
+
+- added a Conflicts to gnu-jaf to geronimo-jav-1_0_2-api 
+
 -------------------------------------------------------------------
 Tue Aug 26 09:31:31 CEST 2008 - anosek@suse.cz
 
diff --git a/geronimo-specs.spec b/geronimo-specs.spec
index 372a9a9..b7e5cd8 100644
--- a/geronimo-specs.spec
+++ b/geronimo-specs.spec
@@ -26,7 +26,7 @@
 
 Name:           geronimo-specs
 Version:        1.1
-Release:        92
+Release:        104
 Summary:        Geronimo J2EE server J2EE specifications
 Url:            http://geronimo.apache.org
 Source0:        %{name}-%{version}-src.tar.bz2
@@ -164,6 +164,7 @@ Requires:       %{name}-poms = %{version}-%{release}
 #Obsoletes:    jaf
 Requires(preun):  /usr/sbin/update-alternatives
 Requires(post):  /usr/sbin/update-alternatives
+Conflicts:      gnu-jaf
 
 %description -n geronimo-jaf-1_0_2-api
 Geronimo is Apache's ASF-licenced J2EE server project. These are the
@@ -1215,13 +1216,15 @@ fi
 %ghost %{_javadir}/servlet.jar
 
 %changelog
+* Mon Dec 01 2008 mvyskocil@suse.cz
+- added a Conflicts to gnu-jaf to geronimo-jav-1_0_2-api
 * Tue Aug 26 2008 anosek@suse.cz
 - fixed path to LICENSE.txt files in spec
 * Mon Aug 25 2008 mvyskocil@suse.cz
 - target=1.5 source=1.5
 - removed a gcj support
 - fixed some rpmlint warnings
-* Tue Apr 22 2008 ro@suse.de
+* Mon Apr 21 2008 ro@suse.de
 - changed requires of main package to use underscores as well
 * Thu Apr 17 2008 mvyskocil@suse.cz
 - Dots in names was replaced by underscore