diff --git a/CHANGES.android b/CHANGES.android
new file mode 100644
index 0000000..302f6c6
--- /dev/null
+++ b/CHANGES.android
@@ -0,0 +1,4 @@
+One manual change is required after running update_source.sh:
+
+In src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java, remove
+the unused import org.mockito.internal.creation.jmock.ClassImposterizer.
diff --git a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java
index c57c900..20168a4 100755
--- a/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java
+++ b/src/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java
@@ -8,7 +8,6 @@
 
 import org.mockito.internal.MockitoCore;
 import org.mockito.internal.creation.MockSettingsImpl;
-import org.mockito.internal.creation.jmock.ClassImposterizer;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -34,4 +33,4 @@
         
         return mockitoCore.mock(clazz, new MockSettingsImpl().defaultAnswer(this));
     }
-}
\ No newline at end of file
+}
diff --git a/update_source.sh b/update_source.sh
index f64bf87..bfe31f2 100755
--- a/update_source.sh
+++ b/update_source.sh
@@ -4,6 +4,8 @@
 #
 # Retrieves the current Mockito source code into the current direcory, exlcuding portions related
 # to constructing Mock objects in the JVM.
+#
+# See also CHANGES.android for required manual changes to the Mockito source code.
 
 SOURCE="git://github.com/mockito/mockito.git"
 INCLUDE="