diff --git a/framework/src/play/db/DBPlugin.java b/framework/src/play/db/DBPlugin.java
index 79a3622d7b..8ef712830e 100644
--- a/framework/src/play/db/DBPlugin.java
+++ b/framework/src/play/db/DBPlugin.java
@@ -286,7 +286,7 @@ private static boolean changed() {
             String datasourceName = dbConfig.getProperty("db", "");
             DataSource ds = DB.getDataSource(dbName);
                      
-            if ((datasourceName.startsWith("java:")) && dbConfig.getProperty("db.url") == null) {
+            if ((datasourceName.startsWith("java:") || datasourceName.startsWith("jndi:")) && dbConfig.getProperty("db.url") == null) {
                 if (ds == null) {
                     return true;
                 }