diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index e3a44fd32..847bd4a68 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -24,7 +24,9 @@
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:theme="@android:style/Theme.Black.NoTitleBar"
-		android:allowBackup="false">
+		android:allowBackup="true"
+		android:fullBackupOnly="true"
+		android:backupAgent=".BackupHandler">
 		<activity
 			android:label="@string/app_name"
 			android:name=".ShatteredPixelDungeon"
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/BackupHandler.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/BackupHandler.java
new file mode 100644
index 000000000..3322b95fd
--- /dev/null
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/BackupHandler.java
@@ -0,0 +1,60 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2017 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.shatteredpixel.shatteredpixeldungeon;
+
+import android.annotation.TargetApi;
+import android.app.backup.BackupAgent;
+import android.app.backup.BackupDataInput;
+import android.app.backup.BackupDataOutput;
+import android.app.backup.FullBackupDataOutput;
+import android.os.ParcelFileDescriptor;
+
+import com.shatteredpixel.shatteredpixeldungeon.journal.Journal;
+import com.watabou.utils.FileUtils;
+
+import java.io.File;
+
+//a handler for android backup requests
+public class BackupHandler extends BackupAgent {
+	
+	//Both of these do nothing. This handler is here to support use of android 4.0+ ADB backup
+	//and android 6.0+ auto-backup. It does not support android 2.2+ key-value backup
+	public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data, ParcelFileDescriptor newState) {}
+	public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState) {}
+	
+	@Override
+	@TargetApi(14)
+	public void onFullBackup(FullBackupDataOutput data) {
+		//fully overrides super.onFullBackup, meaning only files specified here are backed up
+		
+		//does not backup runs in progress, to prevent cheating.
+		
+		//store shared preferences
+		fullBackupFile(new File(getFilesDir().getParent() + "/shared_prefs/"+ ShatteredPixelDungeon.class.getCanonicalName() + ".xml"), data);
+		
+		//store game data
+		fullBackupFile(FileUtils.getFile( getFilesDir(), Rankings.RANKINGS_FILE ), data);
+		fullBackupFile(FileUtils.getFile( getFilesDir(), Badges.BADGES_FILE ), data);
+		fullBackupFile(FileUtils.getFile( getFilesDir(), Journal.JOURNAL_FILE ), data);
+	}
+	
+}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index e8bc12c5c..c8e6c3ab8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -181,7 +181,7 @@ public class Badges {
 		loadGlobal();
 	}
 	
-	private static final String BADGES_FILE	= "badges.dat";
+	public static final String BADGES_FILE	= "badges.dat";
 	private static final String BADGES		= "badges";
 	
 	private static HashSet<Badge> restore( Bundle bundle ) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Journal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Journal.java
index 0398d0b76..90c87207f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Journal.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Journal.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 
 public class Journal {
 	
-	private static final String JOURNAL_FILE = "journal.dat";
+	public static final String JOURNAL_FILE = "journal.dat";
 	
 	private static boolean loaded = false;