diff --git a/WHATSNEW b/WHATSNEW
index 4335d9dff..e9c32fefc 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -23,6 +23,7 @@ Other changes:
 * added classpath attribute and nested element to <script> to allow
   the language jars to be specified in the build script.
   Bugzilla report 29676.
+* trim the driver attribute on the <sql> task. Bugzilla report 21228.
 
 Changes from Ant 1.6.5 to Ant 1.7.0Beta1
 ========================================
diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
index 411d1042b..8c1fe2e09 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
@@ -185,7 +185,7 @@ public abstract class JDBCTask extends Task {
      * @param driver The driver to set
      */
     public void setDriver(String driver) {
-        this.driver = driver;
+        this.driver = driver.trim();
     }
 
     /**