diff --git a/tomcat-7.0-jsvc.wrapper b/tomcat-7.0-jsvc.wrapper
index 56fcc09..3bcff1e 100644
--- a/tomcat-7.0-jsvc.wrapper
+++ b/tomcat-7.0-jsvc.wrapper
@@ -8,13 +8,16 @@ else
 fi
 
 # Get the tomcat config (use this for environment specific settings)
-#if [ -z "${TOMCAT_CFG}" ]; then
-#  TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-#fi
+# if $TOMCAT_CFG wasn't already loaded
+if [ -z "${TOMCAT_CFG_LOADED}" ]; then
+    if [ -z "${TOMCAT_CFG}" ]; then
+      TOMCAT_CFG="/etc/tomcat/tomcat.conf"
+    fi
 
-#if [ -r "$TOMCAT_CFG" ]; then
-#  . $TOMCAT_CFG
-#fi
+    if [ -r "$TOMCAT_CFG" ]; then
+      . $TOMCAT_CFG
+    fi
+fi
 
 set_javacmd
 
@@ -29,6 +32,9 @@ CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
 # if jsvc installed and USE_JSVC=true
 # then use jsvc instead of calling java directly
 if [ -x /usr/bin/jsvc ]; then
+  # Command to use for version so it doesn't use jsvc
+  VER_JAVACMD=$JAVACMD
+
   JAVACMD="/usr/bin/jsvc -nodetach -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out"
   if [ "$1" = "stop" ]; then
     JAVACMD="${JAVACMD} -stop"
@@ -75,7 +81,7 @@ elif [ "$1" = "stop" ]; then
     org.apache.catalina.startup.Bootstrap stop \
     >> ${CATALINA_BASE}/logs/catalina.out 2>&1
 elif [ "$1" = "version" ]; then
-  ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
+  ${VER_JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
     org.apache.catalina.util.ServerInfo
 else
   echo "Usage: $0 {start|start-security|stop|version}"
diff --git a/tomcat.spec b/tomcat.spec
index 7c4e1a4..40b31f7 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -641,6 +641,7 @@ fi
 * Fri Sep 23 2016 Coty Sutherland <csutherl@redhat.com> 0:7.0.72-1
 - Resolves: rhbz#1375582 CVE-2016-5388 Tomcat: CGI sets environmental variable based on user supplied Proxy request header
 - Resolves: rhbz#1376718 CVE-2016-1240 tomcat: Local privilege escalation via unsafe file handling in the Tomcat init script
+- Resolves: rhbz#1379170 jsvc script is broken
 
 * Wed Aug 17 2016 Coty Sutherland <csutherl@redhat.com> 0:7.0.70-3
 - Resolves: rhbz#1170797 remove tomcat6 dependency on redhat-lsb (and any other unnecessary ones)