diff --git a/xmlgraphics-fop-fontlist.script b/xmlgraphics-fop-fontlist.script
index 197b3c6..4cfe83c 100644
--- a/xmlgraphics-fop-fontlist.script
+++ b/xmlgraphics-fop-fontlist.script
@@ -29,7 +29,7 @@ fi
 # Rest of the configuration
 MAIN_CLASS=org.apache.fop.tools.fontlist.FontListMain
 
-BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all excalibur/avalon-framework xerces-j2 xalan-j2 xalan-j2-serializer apache-commons-logging apache-commons-io"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all avalon-framework xerces-j2 xalan-j2 xalan-j2-serializer apache-commons-logging apache-commons-io"
 
 # Set parameters
 set_jvm
diff --git a/xmlgraphics-fop-fontmetrics.script b/xmlgraphics-fop-fontmetrics.script
index 04d6582..748c4ca 100644
--- a/xmlgraphics-fop-fontmetrics.script
+++ b/xmlgraphics-fop-fontmetrics.script
@@ -41,7 +41,7 @@ else
 MAIN_CLASS=${MAIN_CLASS_TTF}
 fi
 
-BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging excalibur/avalon-framework xml-commons-jaxp-1.3-apis xerces-j2 xalan-j2 xalan-j2-serializer"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging avalon-framework xml-commons-jaxp-1.3-apis xerces-j2 xalan-j2 xalan-j2-serializer"
 
 # Set parameters
 set_jvm
diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes
index bbdd460..955b778 100644
--- a/xmlgraphics-fop.changes
+++ b/xmlgraphics-fop.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 10 11:26:27 UTC 2013 - mvyskocil@suse.com
+
+- drop excalibur usage from all classpaths, use avalon-framework instead 
+
 -------------------------------------------------------------------
 Mon Dec 17 10:21:55 UTC 2012 - mvyskocil@suse.com
 
diff --git a/xmlgraphics-fop.script b/xmlgraphics-fop.script
index fe70d3f..9ebe121 100644
--- a/xmlgraphics-fop.script
+++ b/xmlgraphics-fop.script
@@ -33,7 +33,7 @@ fi
 
 # Rest of the configuration
 MAIN_CLASS=org.apache.fop.cli.Main
-BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io excalibur/avalon-framework-impl excalibur/avalon-framework-api batik-all"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io avalon-framework batik-all"
 
 # Set parameters
 set_jvm
diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec
index b458df0..302e663 100644
--- a/xmlgraphics-fop.spec
+++ b/xmlgraphics-fop.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlgraphics-fop
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 # All rights reserved.
 #