diff --git a/detect.go b/detect.go
index ac90872..9f6c6b4 100644
--- a/detect.go
+++ b/detect.go
@@ -26,6 +26,9 @@ const (
 	// HostGalileo represents the Intel Galileo board.
 	HostGalileo = "Intel Galileo"
 
+	// HostEdison represents teh Intel Edison board.
+	HostEdison = "Intel Edison"
+
 	// HostCubieTruck represents the Cubie Truck.
 	HostCubieTruck = "CubieTruck"
 
@@ -126,6 +129,8 @@ func DetectHost() (host Host, rev int, err error) {
 		return HostBBB, rev, nil
 	case strings.Contains(hardware, "BCM2708") || strings.Contains(hardware, "BCM2709") || strings.Contains(hardware, "BCM2835"):
 		return HostRPi, rev, nil
+	case strings.Contains(model, "Genuine Intel(R) CPU   4000  @  500MHz"):
+		return HostEdison, rev, nil
 	case hardware == "Allwinner sun4i/sun5i Families":
 		if major < 4 || (major == 4 && minor < 4) {
 			return HostNull, 0, fmt.Errorf(
diff --git a/host/all/all.go b/host/all/all.go
index 5bfd7a9..6111be2 100644
--- a/host/all/all.go
+++ b/host/all/all.go
@@ -3,5 +3,6 @@ package all
 
 import (
 	_ "github.com/kidoman/embd/host/bbb"
+	_ "github.com/kidoman/embd/host/edison"
 	_ "github.com/kidoman/embd/host/rpi"
 )
diff --git a/host/edison/edison.go b/host/edison/edison.go
new file mode 100644
index 0000000..7dd9f34
--- /dev/null
+++ b/host/edison/edison.go
@@ -0,0 +1,51 @@
+/*
+	Package edison provides Intel Edison support.
+*/
+package edison
+
+import (
+	"github.com/kidoman/embd"
+	"github.com/kidoman/embd/host/generic"
+)
+
+var pins = embd.PinMap{
+	&embd.PinDesc{ID: "P1_12", Aliases: []string{"12", "GPIO_12"}, Caps: embd.CapDigital, DigitalLogical: 12}, // PWM?
+	&embd.PinDesc{ID: "P1_13", Aliases: []string{"13", "GPIO_13"}, Caps: embd.CapDigital, DigitalLogical: 13}, // PWM?
+	&embd.PinDesc{ID: "P1_14", Aliases: []string{"14", "GPIO_14"}, Caps: embd.CapDigital, DigitalLogical: 14},
+	&embd.PinDesc{ID: "P1_15", Aliases: []string{"15", "GPIO_15"}, Caps: embd.CapDigital, DigitalLogical: 15},
+	&embd.PinDesc{ID: "P1_44", Aliases: []string{"44", "GPIO_44"}, Caps: embd.CapDigital, DigitalLogical: 44},
+	&embd.PinDesc{ID: "P1_45", Aliases: []string{"45", "GPIO_45"}, Caps: embd.CapDigital, DigitalLogical: 45},
+	&embd.PinDesc{ID: "P1_46", Aliases: []string{"46", "GPIO_46"}, Caps: embd.CapDigital, DigitalLogical: 46},
+	&embd.PinDesc{ID: "P1_47", Aliases: []string{"47", "GPIO_47"}, Caps: embd.CapDigital, DigitalLogical: 47},
+	&embd.PinDesc{ID: "P1_48", Aliases: []string{"48", "GPIO_48"}, Caps: embd.CapDigital, DigitalLogical: 48},
+	&embd.PinDesc{ID: "P1_49", Aliases: []string{"49", "GPIO_49"}, Caps: embd.CapDigital, DigitalLogical: 49},
+	&embd.PinDesc{ID: "P1_128", Aliases: []string{"128", "GPIO_128"}, Caps: embd.CapDigital, DigitalLogical: 128}, //CTS?
+	&embd.PinDesc{ID: "P1_129", Aliases: []string{"129", "GPIO_129"}, Caps: embd.CapDigital, DigitalLogical: 129}, //RTS?
+	&embd.PinDesc{ID: "P1_130", Aliases: []string{"130", "GPIO_130", "RXD", "UART0_RXD"}, Caps: embd.CapDigital | embd.CapUART, DigitalLogical: 130},
+	&embd.PinDesc{ID: "P1_131", Aliases: []string{"131", "GPIO_131", "TXD", "UART0_TXD"}, Caps: embd.CapDigital | embd.CapUART, DigitalLogical: 131},
+	&embd.PinDesc{ID: "P1_182", Aliases: []string{"182", "GPIO_182"}, Caps: embd.CapDigital, DigitalLogical: 182}, // PWM?
+	&embd.PinDesc{ID: "P1_183", Aliases: []string{"183", "GPIO_183"}, Caps: embd.CapDigital, DigitalLogical: 183}, // PWM?
+}
+
+var ledMap = embd.LEDMap{}
+
+var spiDeviceMinor = 0 // Check??
+
+func init() {
+	embd.Register(embd.HostEdison, func(rev int) *embd.Descriptor {
+		return &embd.Descriptor{
+			GPIODriver: func() embd.GPIODriver {
+				return embd.NewGPIODriver(pins, generic.NewDigitalPin, nil, nil)
+			},
+			I2CDriver: func() embd.I2CDriver {
+				return embd.NewI2CDriver(generic.NewI2CBus)
+			},
+			LEDDriver: func() embd.LEDDriver {
+				return embd.NewLEDDriver(ledMap, generic.NewLED)
+			},
+			SPIDriver: func() embd.SPIDriver {
+				return embd.NewSPIDriver(spiDeviceMinor, generic.NewSPIBus, nil)
+			},
+		}
+	})
+}