diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index 87c9981dc..cdc9dec52 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -1,8 +1,8 @@
 include $(CONTIKI)/cpu/x86/Makefile.x86_common
 
-CONTIKI_CPU_DIRS += drivers/legacy_pc init/legacy_pc
+CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc
 
-CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c
+CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c
 
 CFLAGS += -m32 -march=i586 -mtune=i586
 LDFLAGS += -m32 -T $(CONTIKI)/cpu/x86/quarkX1000.ld
diff --git a/cpu/x86/drivers/quarkX1000/uart.c b/cpu/x86/drivers/quarkX1000/uart.c
new file mode 100644
index 000000000..ba56992c9
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/uart.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "uart.h"
+#include "uart-16x50.h"
+#include <assert.h>
+
+static uart_16x50_driver_t quarkX1000_uart0;
+static uart_16x50_driver_t quarkX1000_uart1;
+
+/* Divisor setting for 115200 baud from section 18.2.2 of Intel Quark SoC
+ * X1000 Datasheet.
+ */
+#define QUARK_X1000_UART_DL_115200 24
+
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief     Initialize a UART.
+ * \param dev Device to initialize.
+ */
+void
+quarkX1000_uart_init(quarkX1000_uart_dev_t dev)
+{
+  pci_config_addr_t pci_addr;
+
+  assert((dev == QUARK_X1000_UART_0) || (dev == QUARK_X1000_UART_1));
+
+  pci_addr.raw = 0;
+
+  /* PCI addresses from section 18.4 of Intel Quark SoC X1000 Datasheet. */
+  pci_addr.dev = 20;
+  pci_addr.func = (dev == QUARK_X1000_UART_0) ? 1 : 5;
+
+  uart_16x50_init((dev == QUARK_X1000_UART_0) ? &quarkX1000_uart0 : &quarkX1000_uart1, pci_addr, QUARK_X1000_UART_DL_115200);
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * \brief     Transmit a character via a UART.
+ * \param dev Device to use.
+ * \param c   Character to transmit.
+ */
+void
+quarkX1000_uart_tx(quarkX1000_uart_dev_t dev, uint8_t c)
+{
+  assert((dev == QUARK_X1000_UART_0) || (dev == QUARK_X1000_UART_1));
+  uart_16x50_tx((dev == QUARK_X1000_UART_0) ? quarkX1000_uart0 : quarkX1000_uart1, c);
+}
+/*---------------------------------------------------------------------------*/
diff --git a/cpu/x86/drivers/quarkX1000/uart.h b/cpu/x86/drivers/quarkX1000/uart.h
new file mode 100644
index 000000000..8b545d8cd
--- /dev/null
+++ b/cpu/x86/drivers/quarkX1000/uart.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CPU_X86_DRIVERS_QUARKX1000_UART_H_
+#define CPU_X86_DRIVERS_QUARKX1000_UART_H_
+
+#include <stdint.h>
+
+typedef enum {
+  QUARK_X1000_UART_0,
+  QUARK_X1000_UART_1
+} quarkX1000_uart_dev_t;
+
+void quarkX1000_uart_init(quarkX1000_uart_dev_t dev);
+void quarkX1000_uart_tx(quarkX1000_uart_dev_t dev, uint8_t c);
+
+#endif /* CPU_X86_DRIVERS_QUARKX1000_UART_H_ */