diff --git a/MyTracks/proguard-google-api-client.txt b/MyTracks/proguard-google-api-client.txt
index ca7616a58..29b45a1ff 100644
--- a/MyTracks/proguard-google-api-client.txt
+++ b/MyTracks/proguard-google-api-client.txt
@@ -23,3 +23,16 @@
 # Needed by google-api-client-android when linking against an older platform version
 
 -dontwarn com.google.api.client.googleapis.extensions.android.**
+
+# Additional flags from
+# http://stackoverflow.com/questions/14410520/google-drive-api-doesnt-play-well-with-proguard-npe
+-keep class com.google.** { *;}
+-keep interface com.google.** { *;}
+-dontwarn com.google.**
+-keepattributes *Annotation*,Signature
+-keep class * extends com.google.api.client.json.GenericJson {
+*;
+}
+-keep class com.google.api.services.drive.** {
+*;
+}
\ No newline at end of file