diff --git a/NEWS.txt b/NEWS.txt
index d29b76f..b5df75f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -11,6 +11,8 @@ the canvas API (this doesn't affect IE); if this is a problem, either
 continue using an older version of Flot or try an emulation helper
 such as canvas-text or Flashcanvas.
 
+The base and overlay canvas are now using the CSS classes "flot-base"
+and "flot-overlay" to prevent accidental clashes (issue 540).
 
 
 Changes:
diff --git a/jquery.flot.js b/jquery.flot.js
index 576bcd5..65ebe45 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -735,8 +735,8 @@
         
         function setupCanvases() {
             var reused,
-                existingCanvas = placeholder.children("canvas.base"),
-                existingOverlay = placeholder.children("canvas.overlay");
+                existingCanvas = placeholder.children("canvas.flot-base"),
+                existingOverlay = placeholder.children("canvas.flot-overlay");
 
             if (existingCanvas.length == 0 || existingOverlay == 0) {
                 // init everything
@@ -750,8 +750,8 @@
 
                 getCanvasDimensions();
                 
-                canvas = makeCanvas(true, "base");
-                overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features
+                canvas = makeCanvas(true, "flot-base");
+                overlay = makeCanvas(false, "flot-overlay"); // overlay canvas for interactive features
 
                 reused = false;
             }