diff --git a/Android.mk b/Android.mk
index 3d7c95c..f0c3d35 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,7 @@
 # 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_PACKAGE_NAME := CalendarProvider
 
diff --git a/src/com/android/providers/calendar/CalendarSyncAdapter.java b/src/com/android/providers/calendar/CalendarSyncAdapter.java
index da1d895..95f0017 100644
--- a/src/com/android/providers/calendar/CalendarSyncAdapter.java
+++ b/src/com/android/providers/calendar/CalendarSyncAdapter.java
@@ -40,7 +40,8 @@
 import android.provider.Calendar;
 import android.provider.Calendar.Calendars;
 import android.provider.Calendar.Events;
-import android.provider.SubscribedFeeds;
+import com.google.android.gsf.SubscribedFeeds;
+
 import android.provider.SyncConstValue;
 import android.provider.Settings;
 import android.text.TextUtils;