diff --git a/.gitignore b/.gitignore
index c835570..a31175f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,2 @@
-batik.slideshow.script
-batik-squiggle.desktop
-batik.squiggle.script
-batik.svgpp.script
-batik.ttf2svg.script
-batik.rasterizer.script
-batik-repack.sh
 batik-repack-1.7.zip
 batik-orbit-manifests.tar.gz
diff --git a/batik-repack.sh b/batik-repack.sh
new file mode 100644
index 0000000..9ec8e1b
--- /dev/null
+++ b/batik-repack.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+    set +e
+    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+ver=1.7
+
+cd "$tmp"
+unzip -qq "$pwd"/batik-src-$ver.zip
+rm -rf `find -name *.jar`
+zip  -9 -o -r -q "$pwd"/batik-repack-$ver.zip batik-$ver
+touch -r "$pwd"/batik-src-$ver.zip "$pwd"/batik-repack-$ver.zip
+cd - >/dev/null
diff --git a/batik-squiggle.desktop b/batik-squiggle.desktop
new file mode 100644
index 0000000..f9189cf
--- /dev/null
+++ b/batik-squiggle.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Squiggle
+Comment=SVG browser
+Comment[fi]=SVG-selain
+Exec=squiggle
+Terminal=false
+Type=Application
+Icon=squiggle.png
+Encoding=UTF-8
+Categories=Application;Graphics;VectorGraphics;Java;X-JPackage;
+MimeType=image/svg+xml;
diff --git a/batik.rasterizer.script b/batik.rasterizer.script
new file mode 100644
index 0000000..d8b74f6
--- /dev/null
+++ b/batik.rasterizer.script
@@ -0,0 +1,35 @@
+#!/bin/sh
+# 
+# Batik SVG Rasterizer script
+# JPackage Project <http://www.jpackage.org/>
+
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then 
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Source system prefs
+if [ -f /etc/rasterizer.conf ] ; then 
+  . /etc/rasterizer.conf
+fi
+
+# Source user prefs
+if [ -f $HOME/.rasterizerrc ] ; then 
+  . $HOME/.rasterizerrc
+fi
+
+# Configuration
+MAIN_CLASS=org.apache.batik.apps.rasterizer.Main
+BASE_JARS="batik-rasterizer.jar batik-all.jar"
+
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/batik.slideshow.script b/batik.slideshow.script
new file mode 100644
index 0000000..33b8748
--- /dev/null
+++ b/batik.slideshow.script
@@ -0,0 +1,35 @@
+#!/bin/sh
+# 
+# Batik SVG Slideshow script
+# JPackage Project <http://www.jpackage.org/>
+
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then 
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Source system prefs
+if [ -f /etc/slideshow.conf ] ; then 
+  . /etc/slideshow.conf
+fi
+
+# Source user prefs
+if [ -f $HOME/.slideshowrc ] ; then 
+  . $HOME/.slideshowrc
+fi
+
+# Configuration
+MAIN_CLASS=org.apache.batik.apps.slideshow.Main
+BASE_JARS="batik batik-slideshow"
+
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/batik.spec b/batik.spec
index f7f2bd9..9f92b2c 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
@@ -299,6 +299,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 25 2010 Alexander Kurtakov <akurtako@redhat.com> 1.7-9
+- Fix utilities startup scripts.
+
 * Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.7-8
 - Fix build.
 
diff --git a/batik.squiggle.script b/batik.squiggle.script
new file mode 100644
index 0000000..baa96c6
--- /dev/null
+++ b/batik.squiggle.script
@@ -0,0 +1,36 @@
+#!/bin/sh
+# 
+# Batik SVG Browser (Squiggle) script
+# JPackage Project <http://www.jpackage.org/>
+
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then 
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Source system prefs
+if [ -f /etc/squiggle.conf ] ; then 
+  . /etc/squiggle.conf
+fi
+
+# Source user prefs
+if [ -f $HOME/.squigglerc ] ; then 
+  . $HOME/.squigglerc
+fi
+
+# Configuration
+MAIN_CLASS=org.apache.batik.apps.svgbrowser.Main
+BASE_JARS="batik-squiggle.jar batik-all.jar rhino.jar xml-commons-apis.jar
+xml-commons-apis-ext.jar"
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+
+# Let's start
+run "$@"
diff --git a/batik.svgpp.script b/batik.svgpp.script
new file mode 100644
index 0000000..3acd398
--- /dev/null
+++ b/batik.svgpp.script
@@ -0,0 +1,35 @@
+#!/bin/sh
+# 
+# Batik SVG Pretty Printer script
+# JPackage Project <http://www.jpackage.org/>
+
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then 
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Source system prefs
+if [ -f /etc/svgpp.conf ] ; then 
+  . /etc/svgpp.conf
+fi
+
+# Source user prefs
+if [ -f $HOME/.svgpprc ] ; then 
+  . $HOME/.svgpprc
+fi
+
+# Configuration
+MAIN_CLASS=org.apache.batik.apps.svgpp.Main
+BASE_JARS="batik batik-svgpp"
+
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/batik.ttf2svg.script b/batik.ttf2svg.script
new file mode 100644
index 0000000..1913f0f
--- /dev/null
+++ b/batik.ttf2svg.script
@@ -0,0 +1,35 @@
+#!/bin/sh
+# 
+# Batik SVG Font Converter script
+# JPackage Project <http://www.jpackage.org/>
+
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then 
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Source user prefs
+if [ -f /etc/ttf2svg.conf ] ; then 
+  . /etc/ttf2svg.conf
+fi
+
+# Allow user-defined prefs
+if [ -f $HOME/.ttf2svgrc ] ; then 
+  . $HOME/.ttf2svgrc
+fi
+
+# Configuration
+MAIN_CLASS=org.apache.batik.apps.ttf2svg.Main
+BASE_JARS="batik batik-ttf2svg"
+
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/sources b/sources
index 4e3249f..d354596 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,2 @@
-6bf2b55d5f76828b3e21dd0b53eb1874  batik.slideshow.script
-c20cbde45a96e45bf6e657b50b4fa8e2  batik-squiggle.desktop
-0e2b0bc15b89eef1b72306ebcce4075b  batik.svgpp.script
-96002f6d0e61453b72dc8183e0dce9c8  batik.ttf2svg.script
-83bd841d2e11c265c930765d974480c4  batik.squiggle.script
-41e4dcaacf99bb8e583ee3e7e04e662f  batik.rasterizer.script
-26100fd0b228e3466c4e1788589140b3  batik-repack.sh
 207f23ed2d90e9b9982f739398834c4d  batik-repack-1.7.zip
 0a704013b27f1ee5c756ffad3cccdbe8  batik-orbit-manifests.tar.gz