diff --git a/lib/mysql.js b/lib/mysql.js
index 46a8181..8e45adc 100644
--- a/lib/mysql.js
+++ b/lib/mysql.js
@@ -294,6 +294,13 @@ MySQL.prototype.fromDatabase = function (model, data) {
                 case 'Boolean':
                 val = Boolean(val);
                 break;
+                case 'GeoPoint':
+                case 'Point':
+                val = {
+                    lat: val.x,
+                    lng: val.y
+                };
+                break;
             }
         }
         data[key] = val;