diff --git a/osint_linux.c b/osint_linux.c
index ba8cd9f..6902306 100644
--- a/osint_linux.c
+++ b/osint_linux.c
@@ -46,7 +46,6 @@
 #include "osint.h"
 #ifdef RASPBERRY_PI
 #include "gpio_sysfs.h"
-#define GPIO_PIN    17
 #endif
 
 typedef int HANDLE;
@@ -54,6 +53,11 @@ static HANDLE hSerial = -1;
 static struct termios old_sparm;
 static int continue_terminal = 1;
 
+#ifdef RASPBERRY_PI
+static propellerResetGpioPin = 17;
+static propellerResetGpioLevel = 1;
+#endif
+
 /* Normally we use DTR for reset */
 static reset_method_t reset_method = RESET_WITH_DTR;
 
@@ -67,9 +71,32 @@ int use_reset_method(char* method)
     else if (strcasecmp(method, "gpio") == 0)
     {
         reset_method = RESET_WITH_GPIO;
-        gpio_export(GPIO_PIN);
-        gpio_write(GPIO_PIN, 0);
-        gpio_direction(GPIO_PIN, 1);
+
+        char *token;
+        token = strtok(method, ",");
+        token = strtok(NULL, ",");
+        if (token)
+        {
+            propellerResetGpioPin = atoi(token);
+        }
+        token = strtok(NULL, ",");
+        if (token)
+        {
+            propellerResetGpioLevel = atoi(token); 
+        }
+
+        printf ("Using GPIO pin %d as Propeller reset ", propellerResetGpioPin);
+        if (propellerResetGpioLevel)
+        {
+            printf ("(HIGH).\n");
+        }
+        else
+        {
+            printf ("(LOW).\n");
+        }
+        gpio_export(propellerResetGpioPin);
+        gpio_write(propellerResetGpioPin, propellerResetGpioLevel ^ 1);
+        gpio_direction(propellerResetGpioPin, 1);
     }
 #endif
     else {
@@ -385,7 +412,7 @@ static void assert_reset(void)
         break;
 #ifdef RASPBERRY_PI
     case RESET_WITH_GPIO:
-        gpio_write(GPIO_PIN, 1);
+        gpio_write(propellerResetGpioPin, propellerResetGpioLevel);
         break;
 #endif
     default:
@@ -414,7 +441,7 @@ static void deassert_reset(void)
         break;
 #ifdef RASPBERRY_PI
     case RESET_WITH_GPIO:
-        gpio_write(GPIO_PIN, 0);
+        gpio_write(propellerResetGpioPin, propellerResetGpioLevel ^ 1);
         break;
 #endif
     default:
diff --git a/p1load.c b/p1load.c
index d6efcc6..790a766 100644
--- a/p1load.c
+++ b/p1load.c
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
     }
     
 #ifdef RASPBERRY_PI
-    use_reset_method("gpio");
+    use_reset_method("gpio,17,0");
 #endif
 
     switch (InitPort(PORT_PREFIX, port, baudRate, verbose, actualPort)) {