diff --git a/Android.mk b/Android.mk
index 9103789..80a5a10 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,8 +20,6 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
 
-# We depend on googlelogin-client also, but that is already
-# being included by google-framework
 LOCAL_STATIC_JAVA_LIBRARIES := google-framework
 LOCAL_STATIC_JAVA_LIBRARIES += gsf-client     # Google apps only: GSF client libraries
 LOCAL_STATIC_JAVA_LIBRARIES += google-common  # Google apps only: shared Google code
diff --git a/src/com/android/providers/calendar/CalendarProvider.java b/src/com/android/providers/calendar/CalendarProvider.java
index ae97f39..9377737 100644
--- a/src/com/android/providers/calendar/CalendarProvider.java
+++ b/src/com/android/providers/calendar/CalendarProvider.java
@@ -21,7 +21,7 @@
 import com.google.android.collect.Sets;
 import com.google.android.common.gdata.AndroidGDataClient;
 import com.google.android.common.gdata.AndroidXmlParserFactory;
-import com.google.android.googlelogin.GoogleLoginServiceConstants;
+import com.google.android.gsf.GoogleLoginServiceConstants;
 import com.google.android.gsf.AbstractGDataSyncAdapter;
 import com.google.android.gsf.AbstractGDataSyncAdapter.GDataSyncData;
 import com.google.wireless.gdata.calendar.client.CalendarClient;
diff --git a/src/com/android/providers/calendar/CalendarSyncAdapter.java b/src/com/android/providers/calendar/CalendarSyncAdapter.java
index 82aa329..62f1c49 100644
--- a/src/com/android/providers/calendar/CalendarSyncAdapter.java
+++ b/src/com/android/providers/calendar/CalendarSyncAdapter.java
@@ -50,7 +50,7 @@
 import android.util.Log;
 import com.google.android.common.gdata.AndroidGDataClient;
 import com.google.android.common.gdata.AndroidXmlParserFactory;
-import com.google.android.googlelogin.GoogleLoginServiceConstants;
+import com.google.android.gsf.GoogleLoginServiceConstants;
 import com.google.wireless.gdata.calendar.client.CalendarClient;
 import com.google.wireless.gdata.calendar.data.CalendarEntry;
 import com.google.wireless.gdata.calendar.data.CalendarsFeed;
diff --git a/tests/Android.mk b/tests/Android.mk
index c6b3875..6fa46fb 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,7 +9,7 @@
 
 LOCAL_PACKAGE_NAME := CalendarProviderTests
 
-LOCAL_JAVA_LIBRARIES := ext android.test.runner googlelogin-client
+LOCAL_JAVA_LIBRARIES := ext android.test.runner gsf-client
 
 LOCAL_INSTRUMENTATION_FOR := CalendarProvider
 
diff --git a/tests/src/com/android/providers/calendar/CalendarSyncTestingBase.java b/tests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
index fb54dee..0e8f414 100644
--- a/tests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
+++ b/tests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
@@ -32,7 +32,7 @@
 import android.util.Log;
 
 import com.google.android.collect.Maps;
-import com.google.android.googlelogin.GoogleLoginServiceConstants;
+import com.google.android.gsf.GoogleLoginServiceConstants;
 
 import java.util.HashSet;
 import java.util.Map;