diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index a437edbd0876..2b1bf301a126 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libftdi
 PORTVERSION=	0.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.intra2net.com/en/developer/libftdi/download/
 
@@ -38,6 +38,7 @@ PYTHON_USES=		python
 
 post-patch:
 	@${REINPLACE_CMD} \
+		-e '/includedir/s|/$${PROJECT_NAME}||' \
 		-e '/SET.*LIB_SUFFIX/s/64/""/' \
 		-e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
diff --git a/devel/libftdi/files/patch-examples_baud_test.c b/devel/libftdi/files/patch-examples_baud_test.c
deleted file mode 100644
index 8cc5d9911851..000000000000
--- a/devel/libftdi/files/patch-examples_baud_test.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/baud_test.c.orig	2010-02-03 14:19:36.000000000 +0200
-+++ examples/baud_test.c	2010-02-03 14:19:43.000000000 +0200
-@@ -31,6 +31,7 @@
- 
- #include <sys/time.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <ftdi.h>
- 
diff --git a/devel/libftdi/files/patch-examples_bitbang.c b/devel/libftdi/files/patch-examples_bitbang.c
deleted file mode 100644
index e676fd573168..000000000000
--- a/devel/libftdi/files/patch-examples_bitbang.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/bitbang.c.orig	2010-02-03 14:25:06.000000000 +0200
-+++ examples/bitbang.c	2010-02-03 14:25:13.000000000 +0200
-@@ -1,6 +1,7 @@
- /* This program is distributed under the GPL, version 2 */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #ifdef __WIN32__
- #define sleep(x) Sleep(x)
diff --git a/devel/libftdi/files/patch-examples_bitbang2.c b/devel/libftdi/files/patch-examples_bitbang2.c
deleted file mode 100644
index a54e6898e02d..000000000000
--- a/devel/libftdi/files/patch-examples_bitbang2.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/bitbang2.c.orig	2010-02-03 14:18:25.000000000 +0200
-+++ examples/bitbang2.c	2010-02-03 14:18:34.000000000 +0200
-@@ -30,6 +30,7 @@
- 
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #ifdef __WIN32__
- #define usleep(x) Sleep((x+999)/1000)
diff --git a/devel/libftdi/files/patch-examples_bitbang_ft2232.c b/devel/libftdi/files/patch-examples_bitbang_ft2232.c
deleted file mode 100644
index 4022fd603545..000000000000
--- a/devel/libftdi/files/patch-examples_bitbang_ft2232.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/bitbang_ft2232.c.orig	2010-02-03 14:18:48.000000000 +0200
-+++ examples/bitbang_ft2232.c	2010-02-03 14:18:57.000000000 +0200
-@@ -9,6 +9,7 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #ifdef __WIN32__
- #define sleep(x) _sleep(x)
diff --git a/devel/libftdi/files/patch-examples_find_all.c b/devel/libftdi/files/patch-examples_find_all.c
deleted file mode 100644
index 269099a2d39a..000000000000
--- a/devel/libftdi/files/patch-examples_find_all.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/find_all.c.orig	2009-03-17 23:06:40.000000000 +0200
-+++ examples/find_all.c	2010-02-03 14:17:13.000000000 +0200
-@@ -6,6 +6,7 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ftdi.h>
- 
- int main(void)
diff --git a/devel/libftdi/files/patch-examples_simple.c b/devel/libftdi/files/patch-examples_simple.c
deleted file mode 100644
index c390d4ad45ae..000000000000
--- a/devel/libftdi/files/patch-examples_simple.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/simple.c.orig	2009-03-17 23:05:53.000000000 +0200
-+++ examples/simple.c	2010-02-03 14:17:13.000000000 +0200
-@@ -6,6 +6,7 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ftdi.h>
- 
- int main(void)