diff --git a/pandora_agents/android/ChangeLog b/pandora_agents/android/ChangeLog
index 0d8ee3f276..0a57eb897d 100644
--- a/pandora_agents/android/ChangeLog
+++ b/pandora_agents/android/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-24 Mark Holland <mark@mark-holland.me.uk>
+
+	* src/pandroid/agent/PandroidAgentListener.java:
+	Reverted to original writeFile method, changed
+	xml encoding header to iso-8859-1
+
+
 2012-09-12  Sergio Martin <sergio.martin@artica.es>
 
 	* src/pandroid/agent/PandroidAgent.java
diff --git a/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk b/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk
new file mode 100644
index 0000000000..55133e268d
Binary files /dev/null and b/pandora_agents/android/Pandroid Agent v3.0_iso-8859-1.apk differ
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
index 822b63b4ac..0d3d04b008 100644
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
@@ -207,7 +207,7 @@ public class PandroidAgentListener extends Service {
 	private String buildXML(){
 		String buffer = "";
 		String gpsData = "";
-		buffer += "<?xml version='1.0' encoding='utf-8'?>\n";
+		buffer += "<?xml version='1.0' encoding='iso-8859-1'?>\n";
 		
 		String latitude = getSharedData("PANDROID_DATA", "latitude", "181", "float");
 		String longitude = getSharedData("PANDROID_DATA", "longitude", "181", "float");
@@ -358,7 +358,7 @@ public class PandroidAgentListener extends Service {
 	
     private void writeFile(String fileName, String textToWrite) {
 try { // catches IOException below
-    		
+    		/*
     		String UTF8 = "utf8";
     		int BUFFER_SIZE = 8192;
     		
@@ -372,15 +372,15 @@ try { // catches IOException below
     		//ensure that everything is really written out and close
     		bw.flush();
     		bw.close();
-    		/*
+    		*/
     		FileOutputStream fOut = openFileOutput(fileName, MODE_WORLD_READABLE);
     		OutputStreamWriter osw = new OutputStreamWriter(fOut); 
     		
     		// Write the string to the file
     		osw.write(textToWrite);
     		/* ensure that everything is really written out and close */
-    		//osw.flush();
-    		//osw.close();
+    		osw.flush();
+    		osw.close();
     	} catch (IOException e) {
 
     	}
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
index edd566eb98..0a0081df9c 100755
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
@@ -113,7 +113,7 @@ class tentacle_client {
 	    } catch (IOException e) {
 	    	getError("Could not get the file");
 	    }
-	    Log.v("MARK",data);
+	    
 	    getInfo("*** Start of transference ***\n",verbose);
 	    // Send the file name and length
 	    try {
@@ -133,7 +133,7 @@ class tentacle_client {
 	    if (serverResponse != null && serverResponse.equals("SEND OK")) {
 		    try {
 		    	 getInfo("Client -> Server: [file data]\n", verbose);
-		    	 serverOutput.write(data.getBytes());
+		    	 serverOutput.writeBytes(data);
 		    	 
 		    } catch (IOException e) {
 		    	getError("Could not write on server");