diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
index cc80d992a..ac2387e2e 100644
--- a/android/res/menu/rocket_viewer_option_menu.xml
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <item
+        android:id="@+id/menu_save"
+        android:title="@string/save"/>
     <item
         android:id="@+id/motor_list_menu_option"
         android:icon="@drawable/ic_motorbrowser"
diff --git a/android/src/build.properties b/android/src/build.properties
new file mode 100644
index 000000000..b892c0978
--- /dev/null
+++ b/android/src/build.properties
@@ -0,0 +1,2 @@
+build.version=12.03-droid-DEV
+build.source=source
diff --git a/android/src/net/sf/openrocket/android/Application.java b/android/src/net/sf/openrocket/android/Application.java
index 668d7598c..a06fde461 100644
--- a/android/src/net/sf/openrocket/android/Application.java
+++ b/android/src/net/sf/openrocket/android/Application.java
@@ -1,24 +1,30 @@
 package net.sf.openrocket.android;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Locale;
 
 import net.sf.openrocket.aerodynamics.WarningSet;
 import net.sf.openrocket.android.util.AndroidLogWrapper;
 import net.sf.openrocket.database.ComponentPresetDatabase;
 import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.file.openrocket.OpenRocketSaver;
 import net.sf.openrocket.l10n.DebugTranslator;
 import net.sf.openrocket.l10n.ResourceBundleTranslator;
 import net.sf.openrocket.l10n.Translator;
+import android.net.Uri;
 import android.preference.PreferenceManager;
 
 public class Application extends android.app.Application {
 
 	private OpenRocketDocument rocketDocument;
+	private Uri fileUri;
+
 	private WarningSet warnings;
-	
+
 	// Big B boolean so I can synchronize on it.
 	private static Boolean initialized = false;
-	
+
 	public void initialize() {
 		synchronized (initialized) {
 			if ( initialized == true ) {
@@ -29,21 +35,21 @@ public class Application extends android.app.Application {
 			System.setProperty("org.xml.sax.driver","org.xmlpull.v1.sax2.Driver");
 
 			net.sf.openrocket.startup.Application.setLogger( new AndroidLogWrapper.LogHelper() );
-			
+
 			net.sf.openrocket.startup.Application.setPreferences( new PreferencesAdapter() );
-			
+
 			net.sf.openrocket.startup.Application.setComponentPresetDao( new ComponentPresetDatabase() );
-			
+
 			MotorDatabaseAdapter db = new MotorDatabaseAdapter(this);
 
 			net.sf.openrocket.startup.Application.setMotorSetDatabase(db);
-			
+
 			Translator t;
 			t = new ResourceBundleTranslator("l10n.messages");
 			if (Locale.getDefault().getLanguage().equals("xx")) {
 				t = new DebugTranslator(t);
 			}
-			
+
 			net.sf.openrocket.startup.Application.setBaseTranslator(t);
 
 			initialized = true;
@@ -84,7 +90,18 @@ public class Application extends android.app.Application {
 	public void setWarnings(WarningSet warnings) {
 		this.warnings = warnings;
 	}
-	
-	
-	
+
+	public Uri getFileUri() {
+		return fileUri;
+	}
+
+	public void setFileUri(Uri fileUri) {
+		this.fileUri = fileUri;
+	}
+
+	public void saveOpenRocketDocument() throws IOException {
+		OpenRocketSaver saver = new OpenRocketSaver();
+		saver.save(new File(fileUri.getPath()),rocketDocument);
+
+	}
 }
diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
index 151a6e0f6..c17057fe6 100644
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
@@ -46,6 +46,7 @@ implements TCQueryAction.OnTCQueryCompleteListener, OpenRocketLoaderFragment.OnO
 	}
 
 	private void loadOrkFile( Uri file ) {
+		((Application)getApplication()).setFileUri( file );
 		AndroidLogWrapper.d(OpenRocketLoaderActivity.class,"Use ork file: " + file);
 		String path = file.getPath();
 		File orkFile = new File(path);
diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
index a061305f7..42aaff12f 100644
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -1,6 +1,8 @@
 package net.sf.openrocket.android.rocket;
 
 
+import java.io.IOException;
+
 import net.sf.openrocket.R;
 import net.sf.openrocket.android.ActivityHelpers;
 import net.sf.openrocket.android.Application;
@@ -37,13 +39,13 @@ implements Simulations.OnSimulationSelectedListener
 		setContentView(R.layout.openrocketviewer);
 		ViewPager viewPager = (ViewPager)findViewById(R.id.pager);
 		viewPager.setAdapter( new OpenRocketViewerPager( this.getSupportFragmentManager()));
-		
+
 		setTitle(app.getRocketDocument().getRocket().getName());
-		
+
 		getActionBarHelper().setDisplayHomeAsUpEnabled(true);
-		
+
 	}
-	
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
@@ -55,6 +57,14 @@ implements Simulations.OnSimulationSelectedListener
 	public boolean onMenuItemSelected(int featureId, MenuItem item) {
 		AndroidLogWrapper.d(OpenRocketViewer.class,"onMenuItemSelected" + item.getItemId());
 		switch(item.getItemId()) {
+		case R.id.menu_save:
+			// FIXME - Probably want to open a dialog here.
+			try {
+				((Application)getApplication()).saveOpenRocketDocument();
+			} catch ( IOException iex ) {
+				AndroidLogWrapper.d(OpenRocketViewer.class, iex.getMessage());
+			}
+			return true;
 		case android.R.id.home:
 			ActivityHelpers.goHome(this);
 			return true;
@@ -73,7 +83,7 @@ implements Simulations.OnSimulationSelectedListener
 
 	@Override
 	public void onSimulationSelected(int simulationId) {
-		
+
 		Simulation sim = app.getRocketDocument().getSimulation(simulationId);
 		// Check if there is data for this simulation.
 		if ( sim.getSimulatedData().getBranchCount() == 0 ) {
@@ -83,7 +93,7 @@ implements Simulations.OnSimulationSelectedListener
 			builder.show();
 			return;
 		}
-		
+
 		View sidepane = findViewById(R.id.sidepane);
 		if ( /* if multi pane */ sidepane != null ) {
 			SimulationChart chart = new SimulationChart(simulationId);