diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 3579416997cc..10d8fbdf4d81 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -23,6 +23,4 @@ USE_GLIB=	yes
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-
 .include <bsd.port.mk>
diff --git a/devel/py-orbit/files/patch-src::Makefile.in b/devel/py-orbit/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..4321f9f54089
--- /dev/null
+++ b/devel/py-orbit/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed Oct 17 07:44:15 2001
++++ src/Makefile.in	Mon Mar 25 12:06:12 2002
+@@ -103,7 +103,7 @@
+ pyexecdir = @pyexecdir@
+ pythondir = @pythondir@
+ 
+-INCLUDES = $(PYTHON_INCLUDES) $(PYTHON_CFLAGS) $(ORBIT_CFLAGS)
++INCLUDES = $(PYTHON_INCLUDES) $(PYTHON_CFLAGS) $(ORBIT_CFLAGS) $(LIBIDL_CFLAGS)
+ LIBS = $(ORBIT_LIBS) 
+ 
+ pyexec_PROGRAMS = CORBAmodule$(SO)  PortableServermodule$(SO)
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index 3579416997cc..10d8fbdf4d81 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -23,6 +23,4 @@ USE_GLIB=	yes
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-
 .include <bsd.port.mk>
diff --git a/devel/py-orbit2/files/patch-src::Makefile.in b/devel/py-orbit2/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..4321f9f54089
--- /dev/null
+++ b/devel/py-orbit2/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed Oct 17 07:44:15 2001
++++ src/Makefile.in	Mon Mar 25 12:06:12 2002
+@@ -103,7 +103,7 @@
+ pyexecdir = @pyexecdir@
+ pythondir = @pythondir@
+ 
+-INCLUDES = $(PYTHON_INCLUDES) $(PYTHON_CFLAGS) $(ORBIT_CFLAGS)
++INCLUDES = $(PYTHON_INCLUDES) $(PYTHON_CFLAGS) $(ORBIT_CFLAGS) $(LIBIDL_CFLAGS)
+ LIBS = $(ORBIT_LIBS) 
+ 
+ pyexec_PROGRAMS = CORBAmodule$(SO)  PortableServermodule$(SO)