diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/AirSyncBaseLocation.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/AirSyncBaseLocation.php
index 03129de9b20..4731ef488fa 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/AirSyncBaseLocation.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/AirSyncBaseLocation.php
@@ -36,8 +36,8 @@ class Horde_ActiveSync_Message_AirSyncBaseLocation extends Horde_ActiveSync_Mess
         Horde_ActiveSync::AIRSYNCBASE_ALTITUDE => array(self::KEY_ATTRIBUTE => 'altitude'),
         Horde_ActiveSync::AIRSYNCBASE_ALTITUDEACCURACY => array(self::KEY_ATTRIBUTE => 'altitudeaccuracy'),
         Horde_ActiveSync::AIRSYNCBASE_ANNOTATION => array(self::KEY_ATTRIBUTE => 'annotation'),
-        Horde_ActiveSync::AIRSYNCBASE_CITY => array(self::KEY_ATTRIBUTE => 'annotation'),
-        Horde_ActiveSync::AIRSYNCBASE_COUNTRY => array(self::KEY_ATTRIBUTE => 'annotation'),
+        Horde_ActiveSync::AIRSYNCBASE_CITY => array(self::KEY_ATTRIBUTE => 'city'),
+        Horde_ActiveSync::AIRSYNCBASE_COUNTRY => array(self::KEY_ATTRIBUTE => 'country'),
         Horde_ActiveSync::AIRSYNCBASE_DISPLAYNAME => array(self::KEY_ATTRIBUTE => 'displayname'),
         Horde_ActiveSync::AIRSYNCBASE_LATITUDE => array(self::KEY_ATTRIBUTE => 'latitude'),
         Horde_ActiveSync::AIRSYNCBASE_LOCATIONURI => array(self::KEY_ATTRIBUTE => 'locationuri'),