diff --git a/nodes/core/hardware/36-rpi-gpio.js b/nodes/core/hardware/36-rpi-gpio.js
index ee66cb585..4c6bae7aa 100644
--- a/nodes/core/hardware/36-rpi-gpio.js
+++ b/nodes/core/hardware/36-rpi-gpio.js
@@ -32,25 +32,43 @@ if (!fs.existsSync("/usr/local/bin/gpio")) {
 // Map physical P1 pins to Gordon's Wiring-Pi Pins (as they should be V1/V2 tolerant)
 var pintable = {
 // Physical : WiringPi
-         "7":"7",
         "11":"0",
         "12":"1",
         "13":"2",
         "15":"3",
         "16":"4",
         "18":"5",
-        "22":"6"
+        "22":"6",
+         "7":"7",
+         "3":"8",
+         "5":"9",
+        "24":"10",
+        "26":"11",
+        "19":"12",
+        "21":"13",
+        "23":"14",
+         "8":"15",
+        "10":"16"
 }
 var tablepin = {
 // WiringPi : Physical
-        "7":"7",
         "0":"11",
         "1":"12",
         "2":"13",
         "3":"15",
         "4":"16",
         "5":"18",
-        "6":"22"
+        "6":"22",
+        "7":"7",
+        "8":"3",
+        "9":"5",
+       "10":"24",
+       "11":"26",
+       "12":"19",
+       "13":"21",
+       "14":"23",
+       "15":"8",
+       "16":"10"
 }
 
 function GPIOInNode(n) {