diff --git a/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py b/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py
index 2866e84c890..d467959b2e2 100644
--- a/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py
+++ b/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py
@@ -29,6 +29,8 @@ import dateutil
 from dateutil.tz import *
 from dateutil.parser import *
 
+import urllib
+
 try:
     import gdata
     import gdata.calendar.service
@@ -112,9 +114,16 @@ class synchronize_google_calendar_events(osv.osv_memory):
 
         if not gmail_user or not gamil_pwd:
             raise osv.except_osv(_('Error'), _("Please specify the user and password !"))
+        
+        if obj.calendar_name != 'all':
+            events_query = gdata.calendar.service.CalendarEventQuery(user=urllib.unquote(obj.calendar_name.split('/')[~0]))
+            events_query.start_index = 1
+            events_query.max_results = 1000
+            
+            event_feed = gd_client.GetCalendarEventFeed(events_query.ToUri())
+        else:
+            event_feed = gd_client.GetCalendarEventFeed()
 
-        # TODO: Get events from selected calendar only.
-        event_feed = gd_client.GetCalendarEventFeed()
         meeting_ids = []
         for feed in event_feed.entry:
             google_id = feed.id.text
diff --git a/addons/sync_google_calendar/wizard/wizard_import_calendar_events_view.xml b/addons/sync_google_calendar/wizard/wizard_import_calendar_events_view.xml
index 1b68b55fe90..c2c8b696cf2 100644
--- a/addons/sync_google_calendar/wizard/wizard_import_calendar_events_view.xml
+++ b/addons/sync_google_calendar/wizard/wizard_import_calendar_events_view.xml
@@ -15,7 +15,7 @@
                         <group colspan="2" col="2"/>
                         <group colspan="2" col="2">
                             <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_calendar_events" string="_Import Calendar" type="object" icon="terp-personal+"/>
+                            <button name="import_calendar_events" string="_Import Events" type="object" icon="terp-calendar"/>
                         </group>
                     </group>
                 </form>