diff --git a/tomcat-7.0-digest.script b/tomcat-7.0-digest.script
index 51df750..2f5c4e3 100644
--- a/tomcat-7.0-digest.script
+++ b/tomcat-7.0-digest.script
@@ -28,6 +28,9 @@ if [ -n "$JSSE_HOME" ]; then
 fi
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
+
+#sanitize the classpath - remove double and trailing colons
+CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
 export CLASSPATH
  
 # Configuration
diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd
index 457b979..cad1666 100644
--- a/tomcat-7.0-tomcat-sysd
+++ b/tomcat-7.0-tomcat-sysd
@@ -34,7 +34,6 @@ else
 fi
 
 set_javacmd
-
 # CLASSPATH munging
 if [[ -n "$JSSE_HOME" ]]; then
     CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
@@ -42,7 +41,9 @@ fi
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
 CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
-CLASSPATH="`echo ${CLASSPATH} | sed -r 's/::+/:/g; s/^:|:$//g'`"
+
+#sanitize the classpath - remove double and trailing colons
+CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
 
 # See how we were called.
 function start() {
diff --git a/tomcat-7.0-tool-wrapper.script b/tomcat-7.0-tool-wrapper.script
index 98b4ef6..a17bef4 100644
--- a/tomcat-7.0-tool-wrapper.script
+++ b/tomcat-7.0-tool-wrapper.script
@@ -28,6 +28,10 @@ if [ -n "$JSSE_HOME" ]; then
 fi
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
+
+#sanitize the classpath - remove double and trailing colons
+CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
+
 export CLASSPATH
  
 # Configuration
diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper
index c119560..5dab047 100644
--- a/tomcat-7.0.wrapper
+++ b/tomcat-7.0.wrapper
@@ -25,7 +25,9 @@ fi
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
 CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
-CLASSPATH="`echo ${CLASSPATH} | sed -r 's/::+/:/g; s/^:|:$//g'`"
+
+#sanitize the classpath - remove double and trailing colons
+CLASSPATH="`echo ${CLASSPATH} | sed 's/::+/:/g; s/^://; s/:$//g'`"
  
 if [ "$1" = "start" ]; then
   ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
diff --git a/tomcat.changes b/tomcat.changes
index 046ba41..4c229c2 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -3,6 +3,7 @@ Sat Feb 16 07:29:52 UTC 2013 - m407@mail.ru
 
 - Fix tomcat init scripts generating malformed classpath
   (http://youtrack.jetbrains.com/issue/JT-18545)
+  bnc#804992
 
 -------------------------------------------------------------------
 Mon Jan 21 13:54:18 UTC 2013 - mvyskocil@suse.com