diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile
index f732a156acd..8120df39c38 100644
--- a/devel/mspdebug/Makefile
+++ b/devel/mspdebug/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2010/12/02 18:41:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2011/04/02 08:22:28 jasper Exp $
 
 COMMENT=		debugger for use with MSP 430 MCUs
 
-DISTNAME=		mspdebug-0.13
+DISTNAME=		mspdebug-0.14
 CATEGORIES=		devel
 
 HOMEPAGE=		http://mspdebug.sourceforge.net/
diff --git a/devel/mspdebug/distinfo b/devel/mspdebug/distinfo
index 5a9b90c210d..f5f770f3ed3 100644
--- a/devel/mspdebug/distinfo
+++ b/devel/mspdebug/distinfo
@@ -1,5 +1,5 @@
-MD5 (mspdebug-0.13.tar.gz) = 7z38BnGZHnRFY6FbK0fvkw==
-RMD160 (mspdebug-0.13.tar.gz) = ZarJfhMlP2k8PoKwyqoE+F/9HS8=
-SHA1 (mspdebug-0.13.tar.gz) = UzCjZShdygqYj7zHjY8xaCQ3Uho=
-SHA256 (mspdebug-0.13.tar.gz) = f3fL4rqyRc9QZHor0j6AP+IuLSGisJU+BVHr8+cvxI4=
-SIZE (mspdebug-0.13.tar.gz) = 91556
+MD5 (mspdebug-0.14.tar.gz) = JpsHyj51LNRcDyNwDk3MpA==
+RMD160 (mspdebug-0.14.tar.gz) = B+tsEsZVTzEBJttlT57h5X76WNs=
+SHA1 (mspdebug-0.14.tar.gz) = IWnetJL8yCC8F1/NIsVY3pF4gt4=
+SHA256 (mspdebug-0.14.tar.gz) = xTBFhp56HY93rCSi5SW1SunsIncVJ6qlNAsPihyr5dM=
+SIZE (mspdebug-0.14.tar.gz) = 91992
diff --git a/devel/mspdebug/patches/patch-Makefile b/devel/mspdebug/patches/patch-Makefile
index a9388c39a9f..72cfedeef53 100644
--- a/devel/mspdebug/patches/patch-Makefile
+++ b/devel/mspdebug/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$OpenBSD: patch-Makefile,v 1.2 2010/12/02 18:41:46 jasper Exp $
+$OpenBSD: patch-Makefile,v 1.3 2011/04/02 08:22:28 jasper Exp $
 
-- Add missing libraries and cflags.
+- Add missing libraries.
 
---- Makefile.orig	Mon Nov  8 22:40:57 2010
-+++ Makefile	Thu Dec  2 13:06:08 2010
-@@ -26,17 +26,21 @@ ifdef WITHOUT_READLINE
+--- Makefile.orig	Sat Apr  2 09:59:32 2011
++++ Makefile	Sat Apr  2 10:00:10 2011
+@@ -26,7 +26,7 @@ ifdef WITHOUT_READLINE
  	READLINE_LIBS =
  else
  	READLINE_CFLAGS = -DUSE_READLINE
@@ -12,34 +12,4 @@ $OpenBSD: patch-Makefile,v 1.2 2010/12/02 18:41:46 jasper Exp $
 +	READLINE_LIBS = -lreadline -ltermcap
  endif
  
--# Mac OS X/MacPorts stuff
  UNAME := $(shell sh -c 'uname -s')
--ifeq ($(UNAME),Darwin)
--	MACPORTS_CFLAGS = -I/opt/local/include
--	MACPORTS_LDFLAGS = -L/opt/local/lib
-+ifeq ($(UNAME),Darwin) # Mac OS X/MacPorts stuff
-+	PORTS_CFLAGS = -I/opt/local/include
-+	PORTS_LDFLAGS = -L/opt/local/lib
- else
--	MACPORTS_CFLAGS =
--	MACPORTS_LDFLAGS =
-+  ifeq ($(UNAME),OpenBSD) # OpenBSD Ports stuff
-+	PORTS_CFLAGS = `pkg-config --cflags libelf libusb`
-+	PORTS_LDFLAGS = `pkg-config --libs libelf libusb`
-+  else
-+	PORTS_CFLAGS =
-+	PORTS_LDFLAGS =
-+  endif
- endif
- 
- MSPDEBUG_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb
-@@ -60,7 +64,7 @@ mspdebug: main.o fet.o rf2500.o dis.o uif.o olimex.o i
- 	  reader.o vector.o output_util.o expr.o fet_error.o binfile.o \
- 	  fet_db.o usbutil.o titext.o srec.o device.o coff.o opdb.o output.o \
- 	  cmddb.o stdcmd.o prog.o flash_bsl.o
--	$(CC) $(LDFLAGS) $(MACPORTS_LDFLAGS) -o $@ $^ -lusb $(READLINE_LIBS)
-+	$(CC) $(LDFLAGS) $(PORTS_LDFLAGS) -o $@ $^ -lusb $(READLINE_LIBS)
- 
- .c.o:
--	$(CC) $(CFLAGS) $(MACPORTS_CFLAGS) $(READLINE_CFLAGS) $(MSPDEBUG_CFLAGS) -o $@ -c $*.c
-+	$(CC) $(CFLAGS) $(PORTS_CFLAGS) $(READLINE_CFLAGS) $(MSPDEBUG_CFLAGS) -o $@ -c $*.c
diff --git a/devel/mspdebug/patches/patch-bsl_c b/devel/mspdebug/patches/patch-bsl_c
deleted file mode 100644
index b5670db4a98..00000000000
--- a/devel/mspdebug/patches/patch-bsl_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-bsl_c,v 1.2 2010/12/02 18:41:46 jasper Exp $
---- bsl.c.orig	Mon Nov  8 22:40:57 2010
-+++ bsl.c	Thu Dec  2 13:05:14 2010
-@@ -31,7 +31,7 @@
- #include "output.h"
- #include "fet_error.h"
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__OpenBSD__)
- #define B460800 460800
- #endif
- 
diff --git a/devel/mspdebug/patches/patch-elf32_c b/devel/mspdebug/patches/patch-elf32_c
deleted file mode 100644
index c2846af07fd..00000000000
--- a/devel/mspdebug/patches/patch-elf32_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-elf32_c,v 1.1.1.1 2010/12/02 10:35:04 jasper Exp $
---- elf32.c.orig	Wed Aug  4 04:08:43 2010
-+++ elf32.c	Thu Aug 12 12:51:04 2010
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__OpenBSD__)
- #include <libelf.h>
- #else
- #include <elf.h>
diff --git a/devel/mspdebug/patches/patch-olimex_c b/devel/mspdebug/patches/patch-olimex_c
deleted file mode 100644
index 1fbfae7777d..00000000000
--- a/devel/mspdebug/patches/patch-olimex_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-olimex_c,v 1.3 2010/12/02 18:41:46 jasper Exp $
---- olimex.c.orig	Mon Nov  8 22:40:57 2010
-+++ olimex.c	Thu Dec  2 13:05:14 2010
-@@ -66,7 +66,7 @@ struct olimex_transport {
- static int open_interface(struct olimex_transport *tr,
- 			  struct usb_device *dev, int ino)
- {
--#if !(defined (__APPLE__) || defined(WIN32))
-+#if defined(__linux__)
- 	int drv;
- 	char drName[256];
- #endif
-@@ -82,7 +82,7 @@ static int open_interface(struct olimex_transport *tr,
- 		return -1;
- 	}
- 
--#if !(defined(__APPLE__) || defined(WIN32))
-+#if defined(__linux__)
- 	drv = usb_get_driver_np(tr->handle, tr->int_number, drName,
- 				sizeof(drName));
- 	printc(__FILE__" : driver %d\n", drv);
diff --git a/devel/mspdebug/patches/patch-rf2500_c b/devel/mspdebug/patches/patch-rf2500_c
index 9f3b3f56b51..edbf40af6cc 100644
--- a/devel/mspdebug/patches/patch-rf2500_c
+++ b/devel/mspdebug/patches/patch-rf2500_c
@@ -1,18 +1,9 @@
-$OpenBSD: patch-rf2500_c,v 1.3 2010/12/02 18:41:46 jasper Exp $
+$OpenBSD: patch-rf2500_c,v 1.4 2011/04/02 08:22:28 jasper Exp $
 
 - usb_bulk_read() returns 0 on timeout, not -1
 
---- rf2500.c.orig	Mon Nov  8 22:40:57 2010
-+++ rf2500.c	Thu Dec  2 13:31:01 2010
-@@ -67,7 +67,7 @@ static int open_interface(struct rf2500_transport *tr,
- 		return -1;
- 	}
- 
--#if !(defined(__APPLE__) || defined(WIN32))
-+#if defined (__linux__)
- 	if (usb_detach_kernel_driver_np(tr->handle, tr->int_number) < 0)
- 		pr_error("rf2500: warning: can't "
- 			"detach kernel driver");
+--- rf2500.c.orig	Sun Feb  6 23:55:37 2011
++++ rf2500.c	Sat Apr  2 10:03:14 2011
 @@ -221,8 +221,12 @@ transport_t rf2500_open(const char *devpath)
  #ifndef __APPLE__
  	while (usb_bulk_read(tr->handle, USB_FET_IN_EP,
diff --git a/devel/mspdebug/patches/patch-uif_c b/devel/mspdebug/patches/patch-uif_c
index c485f142cf8..a8eace409c5 100644
--- a/devel/mspdebug/patches/patch-uif_c
+++ b/devel/mspdebug/patches/patch-uif_c
@@ -1,42 +1,7 @@
-$OpenBSD: patch-uif_c,v 1.2 2010/12/02 18:41:46 jasper Exp $
---- uif.c.orig	Mon Nov  8 22:40:57 2010
-+++ uif.c	Thu Dec  2 13:05:36 2010
-@@ -25,7 +25,9 @@
- #include <unistd.h>
- #include <termios.h>
- 
-+#if defined(__linux__)
- #include <linux/serial.h>
-+#endif
- #include <sys/ioctl.h>
- #include <fcntl.h>
- 
-@@ -33,7 +35,7 @@
- #include "util.h"
- #include "output.h"
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__OpenBSD__)
- #define B460800 460800
- #define B500000 500000
- #endif
-@@ -85,6 +87,7 @@ static void serial_destroy(transport_t tr_base)
- 	free(tr);
- }
- 
-+#if defined(__linux__)
- static int open_olimex_iso(const char *device)
- {
-         int fd = open(device, O_RDWR | O_NOCTTY);
-@@ -112,6 +115,7 @@ static int open_olimex_iso(const char *device)
- 
-         return fd;
- }
-+#endif
- 
- transport_t uif_open(const char *device, uif_type_t type)
- {
-@@ -138,8 +142,12 @@ transport_t uif_open(const char *device, uif_type_t ty
+$OpenBSD: patch-uif_c,v 1.3 2011/04/02 08:22:28 jasper Exp $
+--- uif.c.orig	Sun Feb  6 23:55:37 2011
++++ uif.c	Sat Apr  2 10:06:33 2011
+@@ -150,8 +150,12 @@ transport_t uif_open(const char *device, uif_type_t ty
  		break;
  
  	case UIF_TYPE_OLIMEX_ISO: