diff --git a/docs/up.md b/docs/up.md
index 4216483..aacf055 100644
--- a/docs/up.md
+++ b/docs/up.md
@@ -55,7 +55,7 @@ Note that there is an enum to use wiringPi style numbers.
 | 8           | P1-08        | UART TX     | 14         | UART0                |
 | 9           | P1-09        | GND         |            |                      |
 | 10          | P1-10        | UART RX     | 15         | UART0                |
-| 11          | P1-11        | GPIO(17)    | 17         |                      |
+| 11          | P1-11        | UART_RTS    | 17         | UART0                |
 | 12          | P1-12        | I2S CLK     | 18         |                      |
 | 13          | P1-13        | GPIO(27)    | 27         |                      |
 | 14          | P1-14        | GND         |            |                      |
@@ -80,7 +80,7 @@ Note that there is an enum to use wiringPi style numbers.
 | 33          | P1-33        | PWM1        | 13         | PWM1                 |
 | 34          | P1-34        | GND         |            |                      |
 | 35          | P1-35        | I2S FRM     | 19         |                      |
-| 36          | P1-36        | GPIO(16)    | 16         |                      |
+| 36          | P1-36        | UART_CTS    | 16         | UART0                |
 | 37          | P1-37        | GPIO(26)    | 26         |                      |
 | 38          | P1-38        | I2S DIN     | 20         |                      |
 | 39          | P1-39        | GND         |            |                      |
diff --git a/docs/up2.md b/docs/up2.md
index c161b8f..428fb99 100644
--- a/docs/up2.md
+++ b/docs/up2.md
@@ -54,7 +54,7 @@ physical device names. See the source code in src/x86/up2.c for details.
 | 8        | UART_TX      | 14         | 477        | UART0           |
 | 9        | GND          |            |            |                 |
 | 10       | UART_RX      | 15         | 476        | UART0           |
-| 11       | UART_RTS     | 17         | 478        |                 |
+| 11       | UART_RTS     | 17         | 478        | UART0           |
 | 12       | I2S_CLK      | 18         | 326        |                 |
 | 13       | GPIO(27)     | 27         | 432        |                 |
 | 14       | GND          |            |            |                 |
@@ -79,7 +79,7 @@ physical device names. See the source code in src/x86/up2.c for details.
 | 33       | PWM1         | 13         | 469        | PWM1            |
 | 34       | GND          |            |            |                 |
 | 35       | I2S_FRM      | 19         | 327        |                 |
-| 36       | UART_CTS     | 16         | 479        |                 |
+| 36       | UART_CTS     | 16         | 479        | UART0           |
 | 37       | GPIO(26)     | 26         | 403        |                 |
 | 38       | I2S_DIN      | 20         | 328        |                 |
 | 39       | GND          |            |            |                 |
diff --git a/src/x86/up.c b/src/x86/up.c
index b799f63..495a49e 100644
--- a/src/x86/up.c
+++ b/src/x86/up.c
@@ -148,7 +148,7 @@ mraa_up_board()
     mraa_up_set_pininfo(b, 8,  "UART_TX",  (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 1 }, 14);
     mraa_up_set_pininfo(b, 9,  "GND",      (mraa_pincapabilities_t){ 0, 0, 0, 0, 0, 0, 0, 0 }, -1);
     mraa_up_set_pininfo(b, 10, "UART_RX",  (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 1 }, 15);
-    mraa_up_set_pininfo(b, 11, "GPIO17",   (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 17);
+    mraa_up_set_pininfo(b, 11, "UART_RTS", (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 1 }, 17);
     mraa_up_set_pininfo(b, 12, "I2S_CLK",  (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 18);
     mraa_up_set_pininfo(b, 13, "GPIO27",   (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 27);
     mraa_up_set_pininfo(b, 14, "GND",      (mraa_pincapabilities_t){ 0, 0, 0, 0, 0, 0, 0, 0 }, -1);
@@ -173,7 +173,7 @@ mraa_up_board()
     mraa_up_set_pininfo(b, 33, "PWM1",     (mraa_pincapabilities_t){ 1, 1, 1, 0, 0, 0, 0, 0 }, 13);
     mraa_up_set_pininfo(b, 34, "GND",      (mraa_pincapabilities_t){ 0, 0, 0, 0, 0, 0, 0, 0 }, -1);
     mraa_up_set_pininfo(b, 35, "I2S_FRM",  (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 19);
-    mraa_up_set_pininfo(b, 36, "GPIO16",   (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 16);
+    mraa_up_set_pininfo(b, 36, "UART_CTS", (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 1 }, 16);
     mraa_up_set_pininfo(b, 37, "GPIO26",   (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 26);
     mraa_up_set_pininfo(b, 38, "I2S_DIN",  (mraa_pincapabilities_t){ 1, 1, 0, 0, 0, 0, 0, 0 }, 20);
     mraa_up_set_pininfo(b, 39, "GND",      (mraa_pincapabilities_t){ 0, 0, 0, 0, 0, 0, 0, 0 }, -1);
@@ -230,8 +230,10 @@ mraa_up_board()
 
     // Configure UART #1 (default)
     b->uart_dev_count = 1;
-    mraa_up_get_pin_index(b, "UART_RX", &(b->uart_dev[0].rx));
-    mraa_up_get_pin_index(b, "UART_TX", &(b->uart_dev[0].tx));
+    mraa_up_get_pin_index(b, "UART_RX",  &(b->uart_dev[0].rx));
+    mraa_up_get_pin_index(b, "UART_TX",  &(b->uart_dev[0].tx));
+    mraa_up_get_pin_index(b, "UART_CTS", &(b->uart_dev[0].cts));
+    mraa_up_get_pin_index(b, "UART_RTS", &(b->uart_dev[0].rts));
     b->uart_dev[0].device_path = "/dev/ttyS1";
     b->def_uart_dev = 0;