diff --git a/boot/grub/grub.cfg b/boot/grub/grub.cfg
index ca3a799..20e4ca7 100644
--- a/boot/grub/grub.cfg
+++ b/boot/grub/grub.cfg
@@ -50,6 +50,12 @@ menuentry "[c] CPU info " --hotkey=c {
 	sleep --interruptible 10
 }
 
+if [ -f "/boot/tinycore/tinycore.cfg" ]; then
+	menuentry "[t] Tiny Core" --hotkey=t {
+		configfile /boot/tinycore/tinycore.cfg
+	}
+fi
+
 menuentry "[l] Local Boot" --hotkey=l {
 	insmod chain
 
diff --git a/boot/tinycore/README.md b/boot/tinycore/README.md
new file mode 100644
index 0000000..d38b141
--- /dev/null
+++ b/boot/tinycore/README.md
@@ -0,0 +1,12 @@
+# TinyCore
+
+Unpack a TinyCore iso file to this directory.
+
+TinyCore downloads: http://www.tinycorelinux.net/
+
+Minimal tree:
+```
+.
+├── boot
+└── cde
+```
diff --git a/boot/tinycore/tinycore.cfg b/boot/tinycore/tinycore.cfg
new file mode 100644
index 0000000..ef1a92e
--- /dev/null
+++ b/boot/tinycore/tinycore.cfg
@@ -0,0 +1,26 @@
+# Adapted from isolinux.cfg in *.iso file
+
+menuentry "TinyCore command line only" --class=core {
+	linux  /boot/tinycore/boot/vmlinuz loglevel=3 base
+	initrd /boot/tinycore/boot/core.gz
+}
+
+menuentry "TinyCore CDE" --class=core {
+	linux  /boot/tinycore/boot/vmlinuz loglevel=3 cde
+	initrd /boot/tinycore/boot/core.gz
+}
+
+# Core Plus
+if true; then
+	menuentry "Core Plus (default)" --class=core --class=gui {
+		# Values for desktop: flwm_outside, jwm, icewm, fluxbox, hackedbox, openbox, flwm
+		linux /boot/tinycore/boot/vmlinuz loglevel=3 cde showapps desktop=flwm_topside
+		initrd /boot/tinycore/boot/core.gz
+	}
+	
+	menuentry "Core Plus with X/GUI + Wifi + Firmware" --class=core {
+		#
+		linux /boot/tinycore/boot/vmlinuz loglevel=3 cde showapps lst=xfbase.lst desktop=flwm_topside
+		initrd /boot/tinycore/boot/core.gz
+	}
+fi