diff --git a/CHANGES b/CHANGES
index 8faa04780..b628db551 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,6 +39,7 @@ Misc:
  - Qt: Gray out "Skip BIOS intro" while "Use BIOS file" is unchecked
  - Qt: Allow use of modifier keys as input
  - Qt: Optimize log viewer
+ - GBA RR: Starting from savestate now embeds the savegame
 
 0.3.2: (2015-12-16)
 Bugfixes:
diff --git a/src/gba/rr/rr.c b/src/gba/rr/rr.c
index 2d7fea5e9..981633321 100644
--- a/src/gba/rr/rr.c
+++ b/src/gba/rr/rr.c
@@ -27,7 +27,7 @@ void GBARRInitRecord(struct GBA* gba) {
 
 	if (gba->rr->initFrom & INIT_FROM_SAVESTATE) {
 		struct VFile* vf = gba->rr->openSavestate(gba->rr, O_TRUNC | O_CREAT | O_RDWR);
-		GBASaveStateNamed(gba, vf, 0);
+		GBASaveStateNamed(gba, vf, SAVESTATE_SAVEDATA);
 		vf->close(vf);
 	} else {
 		ARMReset(gba->cpu);
@@ -51,7 +51,7 @@ void GBARRInitPlay(struct GBA* gba) {
 
 	if (gba->rr->initFrom & INIT_FROM_SAVESTATE) {
 		struct VFile* vf = gba->rr->openSavestate(gba->rr, O_RDONLY);
-		GBALoadStateNamed(gba, vf, SAVESTATE_SCREENSHOT);
+		GBALoadStateNamed(gba, vf, SAVESTATE_SCREENSHOT | SAVESTATE_SAVEDATA);
 		vf->close(vf);
 	} else {
 		ARMReset(gba->cpu);