diff --git a/2006/toledo2/.gitignore b/2006/toledo2/.gitignore
index e9a643325..1c39eac7d 100644
--- a/2006/toledo2/.gitignore
+++ b/2006/toledo2/.gitignore
@@ -1,6 +1,22 @@
 #
 # sort with: sort -d -u
+ADVENTUR/
+BASICS/
 C
+DBASEII/
+GAMES/
+KERMIT/
+MASTER/
+MFDISK/
+MODEM7/
+PRO8/
+SOURCE/
+THE-WORD/
+TINKER/
+WS33/
+WS33-1/
+WS33-2/
+WS33-KPR/
 *.dSYM
 indent
 indent.c
diff --git a/2006/toledo2/KAYPROII.ZIP b/2006/toledo2/KAYPROII.ZIP
new file mode 100644
index 000000000..c4d8ed2b1
Binary files /dev/null and b/2006/toledo2/KAYPROII.ZIP differ
diff --git a/2006/toledo2/Makefile b/2006/toledo2/Makefile
index e5aedf7de..74a0c92e0 100644
--- a/2006/toledo2/Makefile
+++ b/2006/toledo2/Makefile
@@ -113,7 +113,10 @@ ENTRY= toledo2
 PROG= ${ENTRY}
 #
 OBJ= ${PROG}.o
-DATA= C.BASIC C.BIOS
+ZIP_DATA= KAYPROII.ZIP
+SUBDIR_SET= ADVENTUR BASICS DBASEII GAMES KERMIT MASTER MFDISK MODEM7 \
+	PRO8 SOURCE THE-WORD TINKER WS33-1 WS33-2 WS33-KPR WS33
+DATA= C.BASIC C.BIOS ${ZIP_DATA}
 TARGET= ${PROG} C
 #
 ALT_OBJ= ${PROG}.alt.o
@@ -149,9 +152,10 @@ ${PROG}.alt: ${PROG}.alt.c
 
 # data files
 #
-data: ${DATA}
-	@${TRUE}
-
+data ${SUBDIR_SET}: ${DATA}
+	${RM} -rf ${SUBDIR_SET}
+	${UNZIP} ${ZIP_DATA} 
+	
 # both all and alt
 #
 everything: all alt
@@ -215,6 +219,7 @@ clobber: clean
 	${RM} -f ${TARGET} ${ALT_TARGET}
 	${RM} -rf *.dSYM
 	${RM} -f C
+	${RM} -rf ${SUBDIR_SET}
 	@-if [ -e sandwich ]; then \
 	    ${RM} -f sandwich; \
 	    echo 'ate sandwich'; \
diff --git a/2006/toledo2/README.md b/2006/toledo2/README.md
index 4bb9cbd45..54f7ce831 100644
--- a/2006/toledo2/README.md
+++ b/2006/toledo2/README.md
@@ -89,6 +89,12 @@ Remember the good old days and play (or let your kids play)
 walking in a maze of twisty little passages all alike is easier than
 understanding the code!
 
+**NOTE**: The `KAYPROII.ZIP` file originally came from
+[http://www.retroarchive.org/cpm/os/KAYPROII.ZIP](http://www.retroarchive.org/cpm/os/KAYPROII.ZIP).
+For your convenience, we have included `KAYPROII.ZIP` in this entry.
+Both the `make all` and the `make alt` unzip that file, and the `make clobber`
+removes those files extracted from the `KAYPROII.ZIP`.
+
 
 ## Author's remarks:
 
@@ -133,10 +139,6 @@ All good programmers started learning
 [BASIC](https://en.wikipedia.org/wiki/BASIC), now, what about a
 [CP/M](https://en.wikipedia.org/wiki/CP/M) emulator?
 
-The extracted files in the various subdirectories originally came from
-[http://www.retroarchive.org/cpm/os/KAYPROII.ZIP](http://www.retroarchive.org/cpm/os/KAYPROII.ZIP)
-but we do not provide the zip file here.
-
 Copy `CPM64.COM` to files named `A` and `B` (these
 will be the disk drives). Now rename the provided `C.BIOS` to `C` and
 run the emulator.