diff --git a/data/jessie/debian-edu-installer-logo.png b/data/jessie/debian-edu-installer-logo.png
new file mode 100644
index 00000000..1311aebb
Binary files /dev/null and b/data/jessie/debian-edu-installer-logo.png differ
diff --git a/data/jessie/splash-skolelinux.png b/data/jessie/splash-skolelinux.png
new file mode 100644
index 00000000..41526d1d
Binary files /dev/null and b/data/jessie/splash-skolelinux.png differ
diff --git a/data/stretch/debian-edu-installer-logo.png b/data/stretch/debian-edu-installer-logo.png
new file mode 100644
index 00000000..1311aebb
Binary files /dev/null and b/data/stretch/debian-edu-installer-logo.png differ
diff --git a/data/stretch/splash-skolelinux.png b/data/stretch/splash-skolelinux.png
new file mode 100644
index 00000000..41526d1d
Binary files /dev/null and b/data/stretch/splash-skolelinux.png differ
diff --git a/debian/changelog b/debian/changelog
index 89140822..27f8d2c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
     (Closes: #783569)
   * Add YA syslinux package to Recommends.
   * Fix handlinkg of LOGOPNG when we've got "doppelganer" initramfs files
+  * Add support for debian-edu builds
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tasks/jessie/debian-edu b/tasks/jessie/debian-edu
new file mode 100644
index 00000000..4203e55f
--- /dev/null
+++ b/tasks/jessie/debian-edu
@@ -0,0 +1,35 @@
+ltsp-client-builder
+debian-edu-archive-keyring-udeb
+debian-edu-install-udeb
+debian-edu-profile-udeb
+eatmydata
+etckeeper
+
+exim4-daemon-heavy
+localechooser
+debian-edu-archive-keyring
+atmel-firmware
+firmware-atheros
+firmware-bnx2
+firmware-bnx2x
+firmware-brcm80211
+firmware-intelwimax
+firmware-ipw2x00
+firmware-ivtv
+firmware-iwlwifi
+firmware-linux-nonfree
+firmware-netxen
+firmware-qlogic
+firmware-ralink
+firmware-realtek
+libertas-firmware
+b43-fwcutter
+wireless-tools
+wpasupplicant
+acpi
+mdetect
+xresprobe
+read-edid
+education-tasks
+debian-edu-config
+debian-edu-install
diff --git a/tasks/stretch/debian-edu b/tasks/stretch/debian-edu
new file mode 100644
index 00000000..4203e55f
--- /dev/null
+++ b/tasks/stretch/debian-edu
@@ -0,0 +1,35 @@
+ltsp-client-builder
+debian-edu-archive-keyring-udeb
+debian-edu-install-udeb
+debian-edu-profile-udeb
+eatmydata
+etckeeper
+
+exim4-daemon-heavy
+localechooser
+debian-edu-archive-keyring
+atmel-firmware
+firmware-atheros
+firmware-bnx2
+firmware-bnx2x
+firmware-brcm80211
+firmware-intelwimax
+firmware-ipw2x00
+firmware-ivtv
+firmware-iwlwifi
+firmware-linux-nonfree
+firmware-netxen
+firmware-qlogic
+firmware-ralink
+firmware-realtek
+libertas-firmware
+b43-fwcutter
+wireless-tools
+wpasupplicant
+acpi
+mdetect
+xresprobe
+read-edid
+education-tasks
+debian-edu-config
+debian-edu-install