diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd
index 392e2df..457b979 100644
--- a/tomcat-7.0-tomcat-sysd
+++ b/tomcat-7.0-tomcat-sysd
@@ -42,6 +42,7 @@ 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'`"
 
 # See how we were called.
 function start() {
diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper
index 268fd35..c119560 100644
--- a/tomcat-7.0.wrapper
+++ b/tomcat-7.0.wrapper
@@ -25,6 +25,7 @@ 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'`"
  
 if [ "$1" = "start" ]; then
   ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
diff --git a/tomcat.changes b/tomcat.changes
index 83e149c..046ba41 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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)
+
 -------------------------------------------------------------------
 Mon Jan 21 13:54:18 UTC 2013 - mvyskocil@suse.com