diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 86b3062f..18949186 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -449,6 +449,7 @@ ARBOR_STEPS2		=	28
 ARBOR_STEPS1		=	29
 ARBOR_STEPS_BOTTOM	=	30
 ARBOR_ARRIVAL_NOELEV	=	31
+ARBOR_IN_LONGSHACK3	=	32
 
 ; NIBEL, up in the clouds
 NIBEL_IN_ELEV2_TOP_CLOSED=	0
diff --git a/mist/graphics_arbor/Makefile b/mist/graphics_arbor/Makefile
index feea1388..c70d49a5 100644
--- a/mist/graphics_arbor/Makefile
+++ b/mist/graphics_arbor/Makefile
@@ -37,7 +37,8 @@ arbor_graphics.inc:	\
 	steps_top_e.lzsa steps_top_w.lzsa \
 	steps1_e.lzsa steps1_w.lzsa \
 	steps2_e.lzsa steps2_w.lzsa \
-	steps_bottom_e.lzsa steps_bottom_open_w.lzsa steps_bottom_closed_w.lzsa
+	steps_bottom_e.lzsa steps_bottom_open_w.lzsa steps_bottom_closed_w.lzsa \
+	inlongshack3_n.lzsa inlongshack3_s.lzsa inlongshack3_e.lzsa inlongshack3_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
@@ -107,6 +108,10 @@ arbor_graphics.inc:	\
 	echo "steps_bottom_e_lzsa: .incbin \"steps_bottom_e.lzsa\"" >> arbor_graphics.inc
 	echo "steps_bottom_open_w_lzsa: .incbin \"steps_bottom_open_w.lzsa\"" >> arbor_graphics.inc
 	echo "steps_bottom_closed_w_lzsa: .incbin \"steps_bottom_closed_w.lzsa\"" >> arbor_graphics.inc
+	echo "inlongshack3_n_lzsa: .incbin \"inlongshack3_n.lzsa\"" >> arbor_graphics.inc
+	echo "inlongshack3_s_lzsa: .incbin \"inlongshack3_s.lzsa\"" >> arbor_graphics.inc
+	echo "inlongshack3_e_lzsa: .incbin \"inlongshack3_e.lzsa\"" >> arbor_graphics.inc
+	echo "inlongshack3_w_lzsa: .incbin \"inlongshack3_w.lzsa\"" >> arbor_graphics.inc
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_arbor/inlongshack3_e.png b/mist/graphics_arbor/inlongshack3_e.png
new file mode 100644
index 00000000..12f2618b
Binary files /dev/null and b/mist/graphics_arbor/inlongshack3_e.png differ
diff --git a/mist/graphics_arbor/inlongshack3_n.png b/mist/graphics_arbor/inlongshack3_n.png
new file mode 100644
index 00000000..1b2cf801
Binary files /dev/null and b/mist/graphics_arbor/inlongshack3_n.png differ
diff --git a/mist/graphics_arbor/inlongshack3_s.png b/mist/graphics_arbor/inlongshack3_s.png
new file mode 100644
index 00000000..d09a53ab
Binary files /dev/null and b/mist/graphics_arbor/inlongshack3_s.png differ
diff --git a/mist/graphics_arbor/inlongshack3_w.png b/mist/graphics_arbor/inlongshack3_w.png
new file mode 100644
index 00000000..587ea896
Binary files /dev/null and b/mist/graphics_arbor/inlongshack3_w.png differ
diff --git a/mist/leveldata_arbor.inc b/mist/leveldata_arbor.inc
index 32e76e8f..fe0eea4d 100644
--- a/mist/leveldata_arbor.inc
+++ b/mist/leveldata_arbor.inc
@@ -11,7 +11,7 @@ locations:
 	.word location20,location21,location22,location23
 	.word location24,location25,location26,location27
 	.word location28,location29,location30,location31
-
+	.word location32
 
 ; ARBOR_INSIDE_ELEV1		-- arrival in elevator1
 location0:
@@ -348,7 +348,7 @@ location18:
 ; ARBOR_LONGSHACK3		-- next longshack
 location19:
 	.byte	ARBOR_BRIDGE5		; north exit
-	.byte	ARBOR_BRIDGE6		; south exit
+	.byte	ARBOR_IN_LONGSHACK3	; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
 	.byte	DIRECTION_N	; north exit_dir
@@ -364,7 +364,7 @@ location19:
 
 ; ARBOR_BRIDGE6		-- the next bridge
 location20:
-	.byte	ARBOR_LONGSHACK3	; north exit
+	.byte	ARBOR_IN_LONGSHACK3	; north exit
 	.byte	ARBOR_SHACK2		; south exit
 	.byte	$ff			; east exit
 	.byte	$ff			; west exit
@@ -381,7 +381,7 @@ location20:
 
 ; ARBOR_SHACK2		-- the shack before the elevator
 location21:
-	.byte	ARBOR_LONGSHACK3	; north exit
+	.byte	ARBOR_BRIDGE6		; north exit
 	.byte	$ff			; south exit
 	.byte	$ff			; east exit
 	.byte	ARBOR_BRIDGE7		; west exit
@@ -584,3 +584,20 @@ location31:
 	.word	$ff			; west bg
 	.byte	BG_EAST
 	.byte	$ff
+
+; ARBOR_IN_LONGSHACK3		-- inside longshack3
+location32:
+	.byte	ARBOR_LONGSHACK3	; north exit
+	.byte	ARBOR_BRIDGE6		; 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	inlongshack3_n_lzsa	; north bg
+	.word	inlongshack3_s_lzsa	; south bg
+	.word	inlongshack3_e_lzsa	; east bg
+	.word	inlongshack3_w_lzsa	; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff