diff --git a/apache-tomcat-7.0.27-src.tar.gz b/apache-tomcat-7.0.27-src.tar.gz
deleted file mode 100644
index 76f3779..0000000
--- a/apache-tomcat-7.0.27-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e692cfe55168e866094d1dba2653d2bb75462c535f0940f756a0253284b2ca9
-size 4189578
diff --git a/apache-tomcat-7.0.30-src.tar.gz b/apache-tomcat-7.0.30-src.tar.gz
new file mode 100644
index 0000000..e02ea2d
--- /dev/null
+++ b/apache-tomcat-7.0.30-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8396fdb6d15326991ed286baef385d62d58d47740565349c16410dc77ebf685
+size 4229801
diff --git a/apache-tomcat-7.0.30-src.tar.gz.asc b/apache-tomcat-7.0.30-src.tar.gz.asc
new file mode 100644
index 0000000..40686d1
--- /dev/null
+++ b/apache-tomcat-7.0.30-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (MingW32)
+
+iQIcBAABAgAGBQJQQx79AAoJEBDAHFovYFnnJqUP/A0wwyvb2q0ggB0eag67Duqs
+h9E/9LTb6KGS+YhbyG5v97eMNCG7qeluBdrgaf1ApLCoZFbkjOuT4PswPhpLELJ6
+CG3zQTaw26HHC2/gUowacxmjZG+koDhIuqSSOYk/KQSpiPXbu3fsqWHsWc0VV+FG
+e9qXVfE2o0wWqNdSOW6tmbOZYhNZ4axEFuiu0GPqpwHM+JwP3qAIVINLgP9kDSBE
+tSQZPhd6tk8/bh/6/6Yu2r+qEUZomIMGYdHrYPSzYrt/uEGXns22V8m5aI0UyzAC
+hEPRJosY1cYr9tZHaVwD0iXsjNNnhSNji1lWB2GR6Cy/J/wiZKpeSNTKwi0Stl43
+el86NyziA199819l7ktJCsb4/UBELUg6OIU+lpoMPlNrg0fiW9yhFEqIZdy3em/5
+FHXAnf/CBIiLW1CNRM4DmUI2dqjL8bwq7ocfvKk/Xg1MQ0KDA2MTGr3l6tHTwjd0
+HAU4QMLW8JI20NIyk1tEzlWpZIAOwNeDvSVV3bJ7pxYMCoWJZUgjGoTmbxohsvu+
+j1dOsS8l084LOKz7kZoCuINlweLntpN62yTge6ijSUvpaYZe2pUSY/kaOkV+LcBi
+LhsGOwAmX0hCyNTmv40u2HKQ8LwqeMAXIerj8NR5GJDiJQpMIHwYgdJfCb1BHdE+
+m8lur09EQUmB2kFA6I1E
+=9QLM
+-----END PGP SIGNATURE-----
diff --git a/tomcat-7.0-tomcat-sysd b/tomcat-7.0-tomcat-sysd
index 4388021..623ced7 100644
--- a/tomcat-7.0-tomcat-sysd
+++ b/tomcat-7.0-tomcat-sysd
@@ -66,6 +66,9 @@ function start() {
         JAVACMD="/usr/bin/jsvc -pidfile ${JSVC_PIDFILE} -nodetach -user ${TOMCAT_USER:-tomcat}"
     fi
 
+    #bnc#779538
+    cd ${CATALINA_BASE}
+
     ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \
         -classpath "$CLASSPATH" \
         -Dcatalina.base="$CATALINA_BASE" \
diff --git a/tomcat-7.0.conf b/tomcat-7.0.conf
index 59b70a9..ee44a36 100644
--- a/tomcat-7.0.conf
+++ b/tomcat-7.0.conf
@@ -5,8 +5,10 @@
 JAVA_HOME="@@@JAVAHOME@@@"
  
 # Where your tomcat installation lives
-CATALINA_BASE="@@@TCHOME@@@"
 CATALINA_HOME="@@@TCHOME@@@"
+# where the given instance lives
+CATALINA_BASE="@@@TCHOME@@@"
+# the temp dir of the instance
 CATALINA_TMPDIR="@@@TCTEMP@@@"
  
 # You can pass some parameters to java here if you wish to
diff --git a/tomcat-rpmlintrc b/tomcat-rpmlintrc
index 4bd312f..13736db 100644
--- a/tomcat-rpmlintrc
+++ b/tomcat-rpmlintrc
@@ -1,2 +1,2 @@
-s is OK - fix of bnc#520532
-addFilter(".*non-etc-or-var-file-marked-as-conffile /srv/tomcat6/webapps/ROOT.*")
+#fix of bnc#520532
+addFilter(".*non-etc-or-var-file-marked-as-conffile /srv/tomcat/webapps/ROOT.*")
diff --git a/tomcat.changes b/tomcat.changes
index f15fee6..05f3c4b 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 11 08:24:53 UTC 2012 - mvyskocil@suse.cz
+
+- update to 7.0.30 (bugfix release) 
+  * SSI and CGI disabled by default
+- fix bnc#779538: change the working dir to $CATALINA_BASE
+- document the CATALINA_BASE and CATALINA_HOME in tomcat.conf better
+- fix rpmlintrc file
+
 -------------------------------------------------------------------
 Thu Jul 19 08:48:31 UTC 2012 - mvyskocil@suse.cz
 
diff --git a/tomcat.spec b/tomcat.spec
index 8aa03a5..b575322 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -24,7 +24,7 @@
 
 %define major_version 7
 %define minor_version 0
-%define micro_version 27
+%define micro_version 30
 
 %define packdname apache-tomcat-%{version}-src
 %define tcuid 91
@@ -70,6 +70,7 @@ Source16:       tomcat-juli-OSGi-MANIFEST.MF
 Source17:       tomcat-7.0-tomcat-sysd
 Source20:       tomcat-7.0-jsvc.service
 Source1000:     tomcat-rpmlintrc
+Source1001:     http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
 
 #PATCH-FIX-UPSTREAM: from jpackage.org package
 Patch0:         %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch