diff --git a/jpackage-utils/bin/build-jar-repository b/jpackage-utils/bin/build-jar-repository
index 780be9e..54b4a69 100755
--- a/jpackage-utils/bin/build-jar-repository
+++ b/jpackage-utils/bin/build-jar-repository
@@ -6,9 +6,12 @@
 #
 # $Id: build-jar-repository,v 1.2 2005/09/17 07:06:19 david Exp $
 
+RPMSCRIPTMODE=
+[ "$RPM_INSTALL_ARG1" -ge 1 ] 2>/dev/null && RPMSCRIPTMODE="-safe"
+
 # Import java functions
-[ -r /usr/share/java-utils/java-functions ] \
- &&  . /usr/share/java-utils/java-functions || exit 1
+[ -r /usr/share/java-utils/java-functions$RPMSCRIPTMODE ] \
+ &&  . /usr/share/java-utils/java-functions$RPMSCRIPTMODE || exit 1
 
 # Prints help message
 usage() {
diff --git a/jpackage-utils/bin/rebuild-jar-repository b/jpackage-utils/bin/rebuild-jar-repository
index 65c1cd2..e8a33cb 100755
--- a/jpackage-utils/bin/rebuild-jar-repository
+++ b/jpackage-utils/bin/rebuild-jar-repository
@@ -6,9 +6,12 @@
 #
 # $Id: rebuild-jar-repository,v 1.3 2006/03/29 19:45:09 jasonc Exp $
 
+RPMSCRIPTMODE=
+[ "$RPM_INSTALL_ARG1" -ge 1 ] 2>/dev/null && RPMSCRIPTMODE="-safe"
+
 # Import java functions
-[ -r /usr/share/java-utils/java-functions ] \
- &&  . /usr/share/java-utils/java-functions || exit 1
+[ -r /usr/share/java-utils/java-functions$RPMSCRIPTMODE ] \
+ &&  . /usr/share/java-utils/java-functions$RPMSCRIPTMODE || exit 1
 
 # Prints help message
 usage() {
diff --git a/jpackage-utils/bin/build-classpath b/jpackage-utils/bin/build-classpath
index 56fc8ae..cfa7900 100755
--- a/jpackage-utils/bin/build-classpath
+++ b/jpackage-utils/bin/build-classpath
@@ -6,9 +6,12 @@
 #
 # $Id: build-classpath,v 1.2 2005/09/17 07:06:19 david Exp $
 
+RPMSCRIPTMODE=
+[ "$RPM_INSTALL_ARG1" -ge 1 ] 2>/dev/null && RPMSCRIPTMODE="-safe"
+
 # Import java functions
-[ -r /usr/share/java-utils/java-functions ] \
- &&  . /usr/share/java-utils/java-functions || exit 1
+[ -r /usr/share/java-utils/java-functions$RPMSCRIPTMODE ] \
+ &&  . /usr/share/java-utils/java-functions$RPMSCRIPTMODE || exit 1
 
 # Prints help message
 usage() {
diff --git a/jpackage-utils/bin/find-jar b/jpackage-utils/bin/find-jar
index 86447a4..546a907 100755
--- a/jpackage-utils/bin/find-jar
+++ b/jpackage-utils/bin/find-jar
@@ -5,9 +5,12 @@
 #
 # $Id: find-jar,v 1.2 2005/09/17 07:06:19 david Exp $
 
+RPMSCRIPTMODE=
+[ "$RPM_INSTALL_ARG1" -ge 1 ] 2>/dev/null && RPMSCRIPTMODE="-safe"
+
 # Import java functions
-[ -r /usr/share/java-utils/java-functions ] \
- &&  . /usr/share/java-utils/java-functions || exit 1
+[ -r /usr/share/java-utils/java-functions$RPMSCRIPTMODE ] \
+ &&  . /usr/share/java-utils/java-functions$RPMSCRIPTMODE || exit 1
 
 # Prints help message
 usage() {