diff --git a/Makefile.am b/Makefile.am
index 0c06de0..aa72dee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,6 +114,8 @@ libavrdude_a_SOURCES = \
 	freebsd_ppi.h \
 	ft245r.c \
 	ft245r.h \
+	gpio.c \
+	gpio.h \
 	jtagmkI.c \
 	jtagmkI.h \
 	jtagmkI_private.h \
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 6aad0df..8ee5074 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -1142,6 +1142,28 @@ programmer
 
 @HAVE_PARPORT_END@
 
+@HAVE_GPIO_BEGIN@
+
+#
+#This programmer bitbangs GPIO lines using the Linux sysfs GPIO interface
+#
+#Set the configuration below to match the GPIO lines connected to the
+#relevant ISP header pin. The GPIO numbers (1-255) are specified  
+#with an offset of 1 to the kernel numbering.
+#
+
+programmer
+  id    = "gpio";
+  desc  = "Use sysfs interface to bitbang GPIO lines";
+  type  = "gpio";
+  reset = 11;
+  sck   = 13;
+  mosi  = 12;
+  miso  = 9;  
+;
+
+@HAVE_GPIO_END@
+
 #
 # some ultra cheap programmers use bitbanging on the 
 # serialport.
diff --git a/config_gram.y b/config_gram.y
index 3929d63..cd40cb9 100644
--- a/config_gram.y
+++ b/config_gram.y
@@ -1346,10 +1346,10 @@ static int assign_pin(int pinno, TOKEN * v, int invert)
   value = v->value.number;
   free_token(v);
 
-  if ((value <= 0) || (value >= 18)) {
+  if ((value <= 0) || (value > 255)) {
     fprintf(stderr, 
             "%s: error at line %d of %s: pin must be in the "
-            "range 1-17\n",
+            "range 1-255\n",
             progname, lineno, infile);
     exit(1);
   }
diff --git a/configure.ac b/configure.ac
index 260f8d2..66dcc33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,18 @@ AC_ARG_ENABLE(
 		*)   AC_MSG_ERROR(bad value ${enableval} for enable-parport option) ;;
 		esac],
 	[enabled_parport=yes])
+	
+AC_ARG_ENABLE(
+	[gpio],
+	AC_HELP_STRING(
+		[--enable-gpio],
+		[Enable using the Linux sysfs GPIO interface(default)]),
+	[case "${enableval}" in
+		yes) enabled_gpio=yes ;;
+		no)  enabled_gpio=no ;;
+		*)   AC_MSG_ERROR(bad value ${enableval} for enable-gpio option) ;;
+		esac],
+	[enabled_gpio=no])	
 
 DIST_SUBDIRS_AC='doc windows'
 
@@ -340,6 +352,15 @@ else
 	confsubst="-e /^@HAVE_PARPORT_BEGIN@/,/^@HAVE_PARPORT_END@/d"
 fi
 
+
+if test "$enabled_gpio" = "yes"; then
+	AC_DEFINE(HAVE_GPIO, 1, [Linux sysfs GPIO support enabled])
+	confsubst="$confsubst -e /^@HAVE_GPIO_/d"
+else
+	confsubst="$confsubst -e /^@HAVE_GPIO_BEGIN@/,/^@HAVE_GPIO_END@/d"
+fi
+
+
 # If we are compiling with gcc, enable all warning and make warnings errors.
 if test "$GCC" = yes; then
     ENABLE_WARNINGS="-Wall"
diff --git a/gpio.c b/gpio.c
new file mode 100644
index 0000000..ad8e22a
--- /dev/null
+++ b/gpio.c
@@ -0,0 +1,325 @@
+/*
+ * avrdude - A Downloader/Uploader for AVR device programmers
+ * Support for bitbanging GPIO pins using the /sys/class/gpio interface
+ * 
+ * Copyright (C) 2010 Radoslav Kolev <radoslav@kolev.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ac_cfg.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "avrdude.h"
+#include "avr.h"
+#include "pindefs.h"
+#include "pgm.h"
+#include "bitbang.h"
+
+#if HAVE_GPIO
+
+/*
+ * GPIO user space helpers
+ *
+ * Copyright 2009 Analog Devices Inc.
+ * Michael Hennerich (hennerich@blackfin.uclinux.org)
+ *
+ * Licensed under the GPL-2 or later
+ */
+ 
+/*
+ * GPIO user space helpers
+ * The following functions are acting on an "unsigned gpio" argument, which corresponds to the 
+ * gpio numbering scheme in the kernel (starting from 0).  
+ * The higher level functions use "int pin" to specify the pins with an offset of 1:
+ * gpio = pin - 1;
+ */
+
+#define GPIO_DIR_IN	0
+#define GPIO_DIR_OUT	1
+ 
+static int gpio_export(unsigned gpio)
+{
+	int fd, len;
+	char buf[11];
+ 
+	fd = open("/sys/class/gpio/export", O_WRONLY);
+	if (fd < 0) {
+		perror("gpio/export");
+		return fd;
+	}
+ 
+	len = snprintf(buf, sizeof(buf), "%d", gpio);
+	write(fd, buf, len);
+	close(fd);
+ 
+	return 0;
+}
+ 
+static int gpio_unexport(unsigned gpio)
+{
+	int fd, len;
+	char buf[11];
+ 
+	fd = open("/sys/class/gpio/unexport", O_WRONLY);
+	if (fd < 0) {
+		perror("gpio/export");
+		return fd;
+	}
+ 
+	len = snprintf(buf, sizeof(buf), "%d", gpio);
+	write(fd, buf, len);
+	close(fd);
+	return 0;
+}
+
+static int gpio_openfd(unsigned gpio)
+{
+  char filepath[60];
+
+	snprintf(filepath, sizeof(filepath), "/sys/class/gpio/gpio%d/value", gpio);
+	return (open(filepath, O_RDWR));
+}
+ 
+static int gpio_dir(unsigned gpio, unsigned dir)
+{
+	int fd, len;
+	char buf[60];
+ 
+	len = snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/direction", gpio);
+ 
+	fd = open(buf, O_WRONLY);
+	if (fd < 0) {
+		perror("gpio/direction");
+		return fd;
+	}
+ 
+	if (dir == GPIO_DIR_OUT)
+		write(fd, "out", 4);
+	else
+		write(fd, "in", 3);
+ 
+	close(fd);
+	return 0;
+}
+ 
+static int gpio_dir_out(unsigned gpio)
+{
+	return gpio_dir(gpio, GPIO_DIR_OUT);
+}
+ 
+static int gpio_dir_in(unsigned gpio)
+{
+	return gpio_dir(gpio, GPIO_DIR_IN);
+}
+
+/*
+ * End of GPIO user space helpers
+ */
+
+#define N_GPIO 256
+
+/*
+* an array which holds open FDs to /sys/class/gpio/gpioXX/value for all needed pins
+*/
+static int gpio_fds[N_GPIO] ;
+
+
+static int gpio_setpin(PROGRAMMER * pgm, int pin, int value)
+{
+  int r;
+
+  if (pin & PIN_INVERSE)
+  {
+    value  = !value;
+    pin   &= PIN_MASK;
+  }
+
+    if ( gpio_fds[pin] < 0 )
+      return -1;
+
+  if (value)
+    r=write(gpio_fds[pin], "1", 1);
+  else
+    r=write(gpio_fds[pin], "0", 1);
+
+  if (r!=1) return -1;
+
+  if (pgm->ispdelay > 1)
+    bitbang_delay(pgm->ispdelay);
+
+  return 0;
+}
+
+static int gpio_getpin(PROGRAMMER * pgm, int pin)
+{
+  unsigned char invert=0;
+  char c;
+
+  if (pin & PIN_INVERSE)
+  {
+    invert = 1;
+    pin   &= PIN_MASK;
+  }
+
+  if ( gpio_fds[pin] < 0 )
+    return -1;
+
+  if (lseek(gpio_fds[pin], 0, SEEK_SET)<0)
+    return -1;  
+    
+  if (read(gpio_fds[pin], &c, 1)!=1)
+    return -1;    
+    
+  if (c=='0')
+    return 0+invert;
+  else if (c=='1')
+    return 1-invert;
+  else 
+    return -1;
+  
+}
+
+static int gpio_highpulsepin(PROGRAMMER * pgm, int pin)
+{
+
+  if ( gpio_fds[pin & PIN_MASK] < 0 )
+    return -1;
+
+  gpio_setpin(pgm, pin, 1);
+  gpio_setpin(pgm, pin, 0);
+
+  return 0;
+}
+
+
+
+static void gpio_display(PROGRAMMER *pgm, const char *p)
+{
+  /* MAYBE */
+}
+
+static void gpio_enable(PROGRAMMER *pgm)
+{
+  /* nothing */
+}
+
+static void gpio_disable(PROGRAMMER *pgm)
+{
+  /* nothing */
+}
+
+static void gpio_powerup(PROGRAMMER *pgm)
+{
+  /* nothing */
+}
+
+static void gpio_powerdown(PROGRAMMER *pgm)
+{
+  /* nothing */
+}
+
+static int gpio_open(PROGRAMMER *pgm, char *port)
+{
+  int r,i;
+
+  bitbang_check_prerequisites(pgm);
+
+
+  for (i=0; i<N_GPIO; i++) 
+		gpio_fds[i]=-1; 
+
+  for (i=0; i<N_PINS; i++) {
+    if (pgm->pinno[i] != 0) {
+        if ((r=gpio_export(pgm->pinno[i]-1)) < 0) 
+	    return r;
+	    
+	    
+	if (i == PIN_AVR_MISO)
+	    r=gpio_dir_in(pgm->pinno[i]-1);
+	else
+	    r=gpio_dir_out(pgm->pinno[i]-1);
+	    
+	if (r < 0)
+	    return r;
+    
+	if ((gpio_fds[pgm->pinno[i]]=gpio_openfd(pgm->pinno[i]-1))<0)
+	    return gpio_fds[pgm->pinno[i]];    
+    }
+  }
+  
+ return(0);
+}
+
+static void gpio_close(PROGRAMMER *pgm)
+{
+  int i;
+
+  pgm->setpin(pgm, pgm->pinno[PIN_AVR_RESET], 1);
+
+  for (i=0; i<N_GPIO; i++) 
+    if (gpio_fds[i]>=0) {
+       close(gpio_fds[i]);
+       gpio_unexport(i-1);
+    }
+  return;
+}
+
+void gpio_initpgm(PROGRAMMER *pgm)
+{
+  strcpy(pgm->type, "GPIO");
+
+  pgm->rdy_led        = bitbang_rdy_led;
+  pgm->err_led        = bitbang_err_led;
+  pgm->pgm_led        = bitbang_pgm_led;
+  pgm->vfy_led        = bitbang_vfy_led;
+  pgm->initialize     = bitbang_initialize;
+  pgm->display        = gpio_display;
+  pgm->enable         = gpio_enable;
+  pgm->disable        = gpio_disable;
+  pgm->powerup        = gpio_powerup;
+  pgm->powerdown      = gpio_powerdown;
+  pgm->program_enable = bitbang_program_enable;
+  pgm->chip_erase     = bitbang_chip_erase;
+  pgm->cmd            = bitbang_cmd;
+  pgm->open           = gpio_open;
+  pgm->close          = gpio_close;
+  pgm->setpin         = gpio_setpin;
+  pgm->getpin         = gpio_getpin;
+  pgm->highpulsepin   = gpio_highpulsepin;
+  pgm->read_byte      = avr_read_byte_default;
+  pgm->write_byte     = avr_write_byte_default;
+}
+
+#else  /* !HAVE_GPIO */
+
+void gpio_initpgm(PROGRAMMER * pgm)
+{
+  fprintf(stderr,
+	  "%s: Linux sysfs GPIO support not available in this configuration\n",
+	  progname);
+}
+
+#endif /* HAVE_GPIO */
+
+
+const char gpio_desc[] = "GPIO bitbanging (linux only, gpio numbers start from 1)";
+
diff --git a/gpio.h b/gpio.h
new file mode 100644
index 0000000..e5cde05
--- /dev/null
+++ b/gpio.h
@@ -0,0 +1,36 @@
+/*
+ * avrdude - A Downloader/Uploader for AVR device programmers
+ * Copyright (C) 2000-2004  Brian S. Dean <bsd@bsdhome.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* $Id: par.h 722 2007-01-24 22:43:46Z joerg_wunsch $ */
+
+#ifndef gpio_h
+#define gpio_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const char gpio_desc[];
+void gpio_initpgm        (PROGRAMMER * pgm);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/pgm_type.c b/pgm_type.c
index b172b1f..9c0d388 100644
--- a/pgm_type.c
+++ b/pgm_type.c
@@ -35,6 +35,7 @@
 #include "buspirate.h"
 #include "butterfly.h"
 #include "ft245r.h"
+#include "gpio.h"
 #include "jtagmkI.h"
 #include "jtagmkII.h"
 #include "jtag3.h"
@@ -64,6 +65,7 @@ const PROGRAMMER_TYPE const programmers_types[] = {
         {"dragon_pdi", jtagmkII_dragon_pdi_initpgm, jtagmkII_dragon_pdi_desc},
         {"dragon_pp", stk500v2_dragon_pp_initpgm, stk500v2_dragon_pp_desc},
         {"ftdi_syncbb", ft245r_initpgm, ft245r_desc},
+        {"gpio", gpio_initpgm, gpio_desc},
         {"jtagmki", jtagmkI_initpgm, jtagmkI_desc},
         {"jtagmkii", jtagmkII_initpgm, jtagmkII_desc},
         {"jtagmkii_avr32", jtagmkII_avr32_initpgm, jtagmkII_avr32_desc},
