diff --git a/pom.xml b/pom.xml
index 13040a701..c5bf6c955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,6 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <scope>runtime</scope>
         </dependency>
 
         <!-- Date and Time -->
diff --git a/src/main/java/org/springframework/samples/petclinic/util/CleanUp.java b/src/main/java/org/springframework/samples/petclinic/util/CleanUp.java
new file mode 100644
index 000000000..9e22cbaa0
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/util/CleanUp.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.util;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.LoggerContext;
+
+/**
+ * When the web application stops, various resources need to be cleaned up to
+ * prevent memory leaks.
+ */
+public class CleanUp implements ServletContextListener {
+
+    @Override
+    public void contextInitialized(ServletContextEvent arg0) {
+        // NO-OP
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent arg0) {
+        // Logback is configured to use JMX so make sure that all objects are
+        // deregistered from JMX else there will be a memory leak
+        // http://logback.qos.ch/manual/jmxConfig.html
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        lc.stop();
+    }
+}
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index ba2b51463..2dda4388a 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -8,7 +8,10 @@
     </contextListener>
 
     <!-- To enable JMX Management -->
+
     <jmxConfigurator/>
+    <!-- Avoid conflicts with other web applications using logback and JMX -->
+    <contextName>PetClinic</contextName>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ea965de25..2d7813935 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,118 +1,121 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-	      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         version="3.0" metadata-complete="true">
-
-    <display-name>Spring PetClinic</display-name>
-    <description>Spring PetClinic sample application</description>
-
-    <!-- When using Spring jpa, use the following: -->
-    <context-param>
-        <param-name>spring.profiles.active</param-name>
-        <param-value>jpa</param-value>
-    </context-param>
-
-    <!-- When using Spring JDBC, use the following: -->
-    <!--  <context-param>
-         <param-name>spring.profiles.active</param-name>
-         <param-value>jdbc</param-value>
-     </context-param>  -->
-
-    <!--  the  CallMonitoringAspect counts invocations on classes with @Repository on them. Classes in spring-data-jpa don't have that annotation  -->
-    <!--  When using Spring Data JPA, uncomment the following: -->
-    <!--
-        <context-param>
-         <param-name>spring.profiles.active</param-name>
-         <param-value>spring-data-jpa</param-value>
-     </context-param>
-     -->
-
-    <!--
-		- Location of the XML file that defines the root application context.
-		- Applied by ContextLoaderListener.
-	-->
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>classpath:spring/business-config.xml, classpath:spring/tools-config.xml</param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-
-    <!--
-- Servlet that dispatches request to registered handlers (Controller implementations).
--->
-    <servlet>
-        <servlet-name>petclinic</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:spring/mvc-core-config.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>petclinic</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <!-- Dandelion servlet definition and mapping -->
-    <servlet>
-        <servlet-name>dandelionServlet</servlet-name>
-        <servlet-class>com.github.dandelion.core.web.DandelionServlet</servlet-class>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>dandelionServlet</servlet-name>
-        <url-pattern>/dandelion-assets/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- used to provide the ability to enter Chinese characters inside the Owner Form -->
-    <filter>
-        <filter-name>encodingFilter</filter-name>
-        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-        <init-param>
-            <param-name>encoding</param-name>
-            <param-value>UTF-8</param-value>
-        </init-param>
-        <init-param>
-            <param-name>forceEncoding</param-name>
-            <param-value>true</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>encodingFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!-- Dandelion filter definition and mapping -->
-    <filter>
-        <filter-name>dandelionFilter</filter-name>
-        <filter-class>com.github.dandelion.core.web.DandelionFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>dandelionFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!-- Dandelion-Datatables filter, used for basic export -->
-    <filter>
-        <filter-name>datatables</filter-name>
-        <filter-class>com.github.dandelion.datatables.core.web.filter.DatatablesFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>datatables</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <!--  	No need for welcome-file declaration here.
-    		See inside spring/mvc-core-config.xml : 
-    		<mvc:view-controller path="/" view-name="welcome" /> 
-    -->
-
-</web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://java.sun.com/xml/ns/javaee"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+	      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0" metadata-complete="true">
+
+    <display-name>Spring PetClinic</display-name>
+    <description>Spring PetClinic sample application</description>
+
+    <!-- When using Spring jpa, use the following: -->
+    <context-param>
+        <param-name>spring.profiles.active</param-name>
+        <param-value>jpa</param-value>
+    </context-param>
+
+    <!-- When using Spring JDBC, use the following: -->
+    <!--  <context-param>
+         <param-name>spring.profiles.active</param-name>
+         <param-value>jdbc</param-value>
+     </context-param>  -->
+
+    <!--  the  CallMonitoringAspect counts invocations on classes with @Repository on them. Classes in spring-data-jpa don't have that annotation  -->
+    <!--  When using Spring Data JPA, uncomment the following: -->
+    <!--
+        <context-param>
+         <param-name>spring.profiles.active</param-name>
+         <param-value>spring-data-jpa</param-value>
+     </context-param>
+     -->
+
+    <!--
+		- Location of the XML file that defines the root application context.
+		- Applied by ContextLoaderListener.
+	-->
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath:spring/business-config.xml, classpath:spring/tools-config.xml</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <listener>
+        <listener-class>org.springframework.samples.petclinic.util.CleanUp</listener-class>
+    </listener>
+    <!--
+- Servlet that dispatches request to registered handlers (Controller implementations).
+-->
+    <servlet>
+        <servlet-name>petclinic</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:spring/mvc-core-config.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>petclinic</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+
+    <!-- Dandelion servlet definition and mapping -->
+    <servlet>
+        <servlet-name>dandelionServlet</servlet-name>
+        <servlet-class>com.github.dandelion.core.web.DandelionServlet</servlet-class>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>dandelionServlet</servlet-name>
+        <url-pattern>/dandelion-assets/*</url-pattern>
+    </servlet-mapping>
+
+    <!-- used to provide the ability to enter Chinese characters inside the Owner Form -->
+    <filter>
+        <filter-name>encodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>encodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- Dandelion filter definition and mapping -->
+    <filter>
+        <filter-name>dandelionFilter</filter-name>
+        <filter-class>com.github.dandelion.core.web.DandelionFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>dandelionFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- Dandelion-Datatables filter, used for basic export -->
+    <filter>
+        <filter-name>datatables</filter-name>
+        <filter-class>com.github.dandelion.datatables.core.web.filter.DatatablesFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>datatables</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!--  	No need for welcome-file declaration here.
+    		See inside spring/mvc-core-config.xml : 
+    		<mvc:view-controller path="/" view-name="welcome" /> 
+    -->
+
+</web-app>