diff --git a/VERSION b/VERSION
index 92862faf..229f0ce0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1-Δ5ε1
\ No newline at end of file
+1-Δ5ε2
\ No newline at end of file
diff --git a/manual.lyx b/manual.lyx
index 2b40ea71..b87d5c5c 100644
--- a/manual.lyx
+++ b/manual.lyx
@@ -5924,5 +5924,17 @@ Movieinfo: Fix display of port #2 type.
 Call on_input() after loadstate.
 \end_layout
 
+\begin_layout Subsection
+rr1-delta5epsilon2
+\end_layout
+
+\begin_layout Itemize
+Fix writing port2 data to movie.
+\end_layout
+
+\begin_layout Itemize
+Fix SRAM handling with Bsnes v087.
+\end_layout
+
 \end_body
 \end_document
diff --git a/manual.txt b/manual.txt
index b748b9d6..4b57303a 100644
--- a/manual.txt
+++ b/manual.txt
@@ -2920,3 +2920,7 @@ set-axis joystick0axis19 disabled
 
 • Call on_input() after loadstate.
 
+15.55 rr1-delta5epsilon2
+
+• Fix writing port2 data to movie.
+
diff --git a/src/core/rom.cpp b/src/core/rom.cpp
index e5cfe0dd..1935ef57 100644
--- a/src/core/rom.cpp
+++ b/src/core/rom.cpp
@@ -499,6 +499,17 @@ namespace
 	std::string sram_name(const nall::string& _id, SNES::Cartridge::Slot slotname)
 	{
 		std::string id(_id, _id.length());
+		//Fixup name change by bsnes v087...
+		if(id == "bsx.ram")
+			id = ".bss";
+		if(id == "bsx.psram")
+			id = ".bsp";
+		if(id == "program.rtc")
+			id = ".rtc";
+		if(id == "upd96050.ram")
+			id = ".dsp";
+		if(id == "program.ram")
+			id = ".srm";
 		if(slotname == SNES::Cartridge::Slot::SufamiTurboA)
 			return "slota." + id.substr(1);
 		if(slotname == SNES::Cartridge::Slot::SufamiTurboB)
diff --git a/src/plat-wxwidgets/romselect.cpp b/src/plat-wxwidgets/romselect.cpp
index 3b6c12f0..c473a1c4 100644
--- a/src/plat-wxwidgets/romselect.cpp
+++ b/src/plat-wxwidgets/romselect.cpp
@@ -80,6 +80,17 @@ namespace
 	std::string sram_name(const nall::string& _id, SNES::Cartridge::Slot slotname)
 	{
 		std::string id(_id, _id.length());
+		//Fixup name change by bsnes v087...
+		if(id == "bsx.ram")
+			id = ".bss";
+		if(id == "bsx.psram")
+			id = ".bsp";
+		if(id == "program.rtc")
+			id = ".rtc";
+		if(id == "upd96050.ram")
+			id = ".dsp";
+		if(id == "program.ram")
+			id = ".srm";
 		if(slotname == SNES::Cartridge::Slot::SufamiTurboA)
 			return "slota." + id.substr(1);
 		if(slotname == SNES::Cartridge::Slot::SufamiTurboB)