diff --git a/ootw/Makefile b/ootw/Makefile
index 2c0b7541..92fd3c94 100644
--- a/ootw/Makefile
+++ b/ootw/Makefile
@@ -55,7 +55,6 @@ intro.o:	intro.s \
 	gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \
 	gr_overlay.s \
 	keyboard.s random16.s text_print.s \
-	intro_tunnel1.inc intro_tunnel2.inc intro_gone.inc \
 	intro_graphics/01_building/intro_car.inc \
 	intro_graphics/01_building/intro_building_car.inc \
 	intro_graphics/01_building/intro_building.inc \
@@ -78,7 +77,10 @@ intro.o:	intro.s \
 	intro_graphics/06_console/intro_collider.inc \
 	intro_graphics/07_soda/intro_open_soda.inc \
 	intro_graphics/07_soda/intro_drinking.inc \
-	intro_graphics/08_lightning/lightning.inc
+	intro_graphics/08_lightning/lightning.inc \
+	intro_graphics/09_tunnel/intro_tunnel1.inc \
+	intro_graphics/09_tunnel/intro_tunnel2.inc \
+	intro_graphics/09_tunnel/intro_gone.inc
 	ca65 -o intro.o intro.s -l intro.lst
 
 ####
diff --git a/ootw/intro.s b/ootw/intro.s
index 8f6d852e..b05d4ae7 100644
--- a/ootw/intro.s
+++ b/ootw/intro.s
@@ -1641,10 +1641,9 @@ gone_loop:
 
 .include "intro_graphics/08_lightning/lightning.inc"
 
-
-.include "intro_tunnel1.inc"
-.include "intro_tunnel2.inc"
-.include "intro_gone.inc"
+.include "intro_graphics/09_tunnel/intro_tunnel1.inc"
+.include "intro_graphics/09_tunnel/intro_tunnel2.inc"
+.include "intro_graphics/09_tunnel/intro_gone.inc"
 
 
 	;=================================
diff --git a/ootw/intro_graphics/09_tunnel/Makefile b/ootw/intro_graphics/09_tunnel/Makefile
new file mode 100644
index 00000000..b5a429e7
--- /dev/null
+++ b/ootw/intro_graphics/09_tunnel/Makefile
@@ -0,0 +1,31 @@
+include ../../../Makefile.inc
+
+PNG2RLE = ../../../gr-utils/png2rle
+
+
+all:	intro_tunnel1.inc intro_tunnel2.inc intro_gone.inc
+
+#####
+
+intro_tunnel1.inc:	$(PNG2RLE) \
+	intro_tunnel1.png
+	$(PNG2RLE) asm intro_tunnel1.png tunnel1_rle > intro_tunnel1.inc
+
+#####
+
+intro_tunnel2.inc:	$(PNG2RLE) \
+	intro_tunnel2.png
+	$(PNG2RLE) asm intro_tunnel2.png tunnel2_rle > intro_tunnel2.inc
+
+#####
+
+intro_gone.inc:	$(PNG2RLE) \
+	intro_gone.png
+	$(PNG2RLE) asm intro_gone.png gone_rle > intro_gone.inc
+
+
+#####
+
+clean:		
+		rm -f *~ *.inc
+
diff --git a/ootw/intro_gone.inc b/ootw/intro_graphics/09_tunnel/intro_gone.inc
similarity index 100%
rename from ootw/intro_gone.inc
rename to ootw/intro_graphics/09_tunnel/intro_gone.inc
diff --git a/ootw/intro_gone.png b/ootw/intro_graphics/09_tunnel/intro_gone.png
similarity index 100%
rename from ootw/intro_gone.png
rename to ootw/intro_graphics/09_tunnel/intro_gone.png
diff --git a/ootw/intro_tunnel1.inc b/ootw/intro_graphics/09_tunnel/intro_tunnel1.inc
similarity index 100%
rename from ootw/intro_tunnel1.inc
rename to ootw/intro_graphics/09_tunnel/intro_tunnel1.inc
diff --git a/ootw/intro_tunnel1.png b/ootw/intro_graphics/09_tunnel/intro_tunnel1.png
similarity index 100%
rename from ootw/intro_tunnel1.png
rename to ootw/intro_graphics/09_tunnel/intro_tunnel1.png
diff --git a/ootw/intro_tunnel2.inc b/ootw/intro_graphics/09_tunnel/intro_tunnel2.inc
similarity index 100%
rename from ootw/intro_tunnel2.inc
rename to ootw/intro_graphics/09_tunnel/intro_tunnel2.inc
diff --git a/ootw/intro_tunnel2.png b/ootw/intro_graphics/09_tunnel/intro_tunnel2.png
similarity index 100%
rename from ootw/intro_tunnel2.png
rename to ootw/intro_graphics/09_tunnel/intro_tunnel2.png