diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile
index a883d95d..1d4f3dfd 100644
--- a/mist/graphics_arbor/Makefile
+++ b/mist/graphics_arbor/Makefile
@@ -26,7 +26,9 @@ arbor_graphics.inc:	\
 	hut2_e.lzsa hut2_w.lzsa \
 	hut2_inside_w.lzsa hut2_inside_s.lzsa \
 	bridge5_n.lzsa bridge5_s.lzsa \
-	longshack3_n.lzsa longshack3_s.lzsa
+	longshack3_n.lzsa longshack3_s.lzsa \
+	bridge6_n.lzsa bridge6_s.lzsa \
+	shack2_n.lzsa shack2_s.lzsa shack2_e.lzsa shack2_w.lzsa
 	echo "arrival_e_lzsa: .incbin \"arrival_e.lzsa\"" > arbor_graphics.inc
 	echo "arrival_open_e_lzsa: .incbin \"arrival_open_e.lzsa\"" >> arbor_graphics.inc
 	echo "arrival_w_lzsa: .incbin \"arrival_w.lzsa\"" >> arbor_graphics.inc
@@ -69,6 +71,13 @@ arbor_graphics.inc:	\
 	echo "bridge5_s_lzsa: .incbin \"bridge5_s.lzsa\"" >> arbor_graphics.inc
 	echo "longshack3_n_lzsa: .incbin \"longshack3_n.lzsa\"" >> arbor_graphics.inc
 	echo "longshack3_s_lzsa: .incbin \"longshack3_s.lzsa\"" >> arbor_graphics.inc
+	echo "bridge6_n_lzsa: .incbin \"bridge6_n.lzsa\"" >> arbor_graphics.inc
+	echo "bridge6_s_lzsa: .incbin \"bridge6_s.lzsa\"" >> arbor_graphics.inc
+	echo "shack2_n_lzsa: .incbin \"shack2_n.lzsa\"" >> arbor_graphics.inc
+	echo "shack2_s_lzsa: .incbin \"shack2_s.lzsa\"" >> arbor_graphics.inc
+	echo "shack2_e_lzsa: .incbin \"shack2_e.lzsa\"" >> arbor_graphics.inc
+	echo "shack2_w_lzsa: .incbin \"shack2_w.lzsa\"" >> arbor_graphics.inc
+
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_arbor/bridge6_n.png b/mist/graphics_arbor/bridge6_n.png
new file mode 100644
index 00000000..0c105cde
Binary files /dev/null and b/mist/graphics_arbor/bridge6_n.png differ
diff --git a/mist/graphics_arbor/bridge6_s.png b/mist/graphics_arbor/bridge6_s.png
new file mode 100644
index 00000000..eee3f3e4
Binary files /dev/null and b/mist/graphics_arbor/bridge6_s.png differ
diff --git a/mist/graphics_arbor/shack2_e.png b/mist/graphics_arbor/shack2_e.png
new file mode 100644
index 00000000..7074f84e
Binary files /dev/null and b/mist/graphics_arbor/shack2_e.png differ
diff --git a/mist/graphics_arbor/shack2_n.png b/mist/graphics_arbor/shack2_n.png
new file mode 100644
index 00000000..f4022557
Binary files /dev/null and b/mist/graphics_arbor/shack2_n.png differ
diff --git a/mist/graphics_arbor/shack2_s.png b/mist/graphics_arbor/shack2_s.png
new file mode 100644
index 00000000..f1265d57
Binary files /dev/null and b/mist/graphics_arbor/shack2_s.png differ
diff --git a/mist/graphics_arbor/shack2_w.png b/mist/graphics_arbor/shack2_w.png
new file mode 100644
index 00000000..48c671e7
Binary files /dev/null and b/mist/graphics_arbor/shack2_w.png differ
diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc
index efc9a408..da3e2521 100644
--- a/mist/leveldata_arbor.inc
+++ b/mist/leveldata_arbor.inc
@@ -8,6 +8,7 @@ locations:
 	.word location8, location9, location10,location11
 	.word location12,location13,location14,location15
 	.word location16,location17,location18,location19
+	.word location20,location21
 
 ; ARBOR_INSIDE_ELEV1		-- arrival in elevator1
 location0:
@@ -344,7 +345,7 @@ location18:
 ; ARBOR_LONGSHACK3		-- next longshack
 location19:
 	.byte	ARBOR_BRIDGE5		; north exit
-	.byte	$ff			; south exit
+	.byte	ARBOR_BRIDGE6		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
@@ -358,3 +359,37 @@ location19:
 	.byte	BG_NORTH|BG_SOUTH
 	.byte	$ff
 
+; ARBOR_BRIDGE6		-- the next bridge
+location20:
+	.byte	ARBOR_LONGSHACK3	; north exit
+	.byte	ARBOR_SHACK2		; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	bridge6_n_lzsa	; north bg
+	.word	bridge6_s_lzsa	; south bg
+	.word	$0000			; east bg
+	.word	$0000			; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff
+
+; ARBOR_SHACK2		-- the shack before the elevator
+location21:
+	.byte	ARBOR_LONGSHACK3	; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	shack2_n_lzsa		; north bg
+	.word	shack2_s_lzsa		; south bg
+	.word	shack2_e_lzsa		; east bg
+	.word	shack2_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff
+