diff --git a/ChangeLog b/ChangeLog
index 8588017e..e014fb63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-30  Rene Liebscher <R.Liebscher@gmx.de>
+
+	bug #37977 Support for Openmoko Debug Board
+	* avrdude.conf.in: added openmoko entry
+
 2013-01-29  Rene Liebscher <R.Liebscher@gmx.de>
 
 	patch #7932 Read USBtiny VID and PID from avrdude.conf if provided.
diff --git a/NEWS b/NEWS
index dad6b75e..8486061c 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Current:
       + o-link (patch #7672 adding support for O-Link (FTDI based
         JTAG) as programmer)
       + 4232h (patch #7715 FT4232H support)
+	  + openmoko (bug #37977 Support for Openmoko Debug Board)
 
     - usbasp
       + nibobee (previously specified as '-c usbasp -P nibobee)
diff --git a/avrdude.conf.in b/avrdude.conf.in
index a7fe118b..2b9fd120 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -481,6 +481,23 @@ programmer parent "jtagkey"
   usbproduct = "USB<=>JTAG&RS232";
 ;
 
+# http://wiki.openmoko.org/wiki/Debug_Board_v3
+programmer
+  id    = "openmoko";
+  desc  = "Openmoko debug board (v3)";
+  type  = "avrftdi";
+  usbvid     = 0x1457;
+  usbpid    = 0x5118;
+  usbdev = "A";
+  usbvendor  = "";
+  usbproduct = "";
+  usbsn      = "";
+  reset  = 4; # TMS 7
+  sck    = 1; # TCK 9
+  mosi   = 2; # TDI 5
+  miso   = 3; # TDO 13
+;
+
 # Only Rev. A boards.
 # Schematic and user manual: http://www.cs.put.poznan.pl/wswitala/download/pdf/811EVBK.pdf
 programmer