diff --git a/framework/src/play/data/binding/Unbinder.java b/framework/src/play/data/binding/Unbinder.java
index 250b0ec86e..aebc7d1cbd 100644
--- a/framework/src/play/data/binding/Unbinder.java
+++ b/framework/src/play/data/binding/Unbinder.java
@@ -51,7 +51,7 @@ private static void unBind(Map<String, Object> result, Object src, Class<?> srcC
                 }
             }
         } else if (Date.class.isAssignableFrom(src.getClass())) {
-            result.put(name, new SimpleDateFormat(DateBinder.ISO).format((Date)src));
+            result.put(name, new SimpleDateFormat(DateBinder.ISO8601).format((Date)src));
         } else {
             Field[] fields = src.getClass().getDeclaredFields();
             for (Field field : fields) {
diff --git a/framework/src/play/data/binding/types/DateBinder.java b/framework/src/play/data/binding/types/DateBinder.java
index 7fdef21823..7d02f5bafd 100644
--- a/framework/src/play/data/binding/types/DateBinder.java
+++ b/framework/src/play/data/binding/types/DateBinder.java
@@ -13,7 +13,7 @@
  */
 public class DateBinder implements TypeBinder<Date> {
 
-    public static final String ISO = "'ISO8086'yyyy-MM-dd'T'HH:mm:ss";
+    public static final String ISO8601 = "'ISO8601:'yyyy-MM-dd'T'HH:mm:ssZ";
 
     public Date bind(String name, Annotation[] annotations, String value, Class actualClass) throws Exception {
 
@@ -31,7 +31,7 @@ public Date bind(String name, Annotation[] annotations, String value, Class actu
         }
 
         try {
-            SimpleDateFormat sdf = new SimpleDateFormat(ISO);
+            SimpleDateFormat sdf = new SimpleDateFormat(ISO8601);
             sdf.setLenient(false);
             return sdf.parse(value);
         } catch(Exception e) {
diff --git a/framework/src/play/test/Fixtures.java b/framework/src/play/test/Fixtures.java
index 20aee6d51f..9552de1d6d 100644
--- a/framework/src/play/test/Fixtures.java
+++ b/framework/src/play/test/Fixtures.java
@@ -224,7 +224,7 @@ static void serialize(Map<?, ?> values, String prefix, Map<String, String[]> ser
             if (value instanceof Map<?, ?>) {
                 serialize((Map<?, ?>) value, prefix + "." + key, serialized);
             } else if (value instanceof Date) {
-                serialized.put(prefix + "." + key.toString(), new String[]{new SimpleDateFormat(DateBinder.ISO).format(((Date) value))});
+                serialized.put(prefix + "." + key.toString(), new String[]{new SimpleDateFormat(DateBinder.ISO8601).format(((Date) value))});
             } else if (value instanceof List<?>) {
                 List<?> l = (List<?>) value;
                 String[] r = new String[l.size()];
diff --git a/samples-and-tests/just-test-cases/test/vendor-data.yml b/samples-and-tests/just-test-cases/test/vendor-data.yml
index 72f4a54440..a6c94897c2 100755
--- a/samples-and-tests/just-test-cases/test/vendor-data.yml
+++ b/samples-and-tests/just-test-cases/test/vendor-data.yml
@@ -22,7 +22,7 @@ vendor.VenueVendor(venue2):
 # Bloc
 Bloc(b):
     name:            Yop
-    created:         2001-11-23 15:03:17 -5
+    created:         2001-11-23T15:03:17-05
     criterias:
         ? key1
         : value1