diff --git a/devel/beediff/Makefile b/devel/beediff/Makefile
new file mode 100644
index 00000000000..769815beb20
--- /dev/null
+++ b/devel/beediff/Makefile
@@ -0,0 +1,40 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2008/03/18 21:26:53 simon Exp $
+
+COMMENT=	graphical file comparator
+
+V=		1.5
+DISTNAME=	beediff_${V}_src
+PKGNAME=	beediff-${V}
+CATEGORIES=	textproc x11
+
+HOMEPAGE=	http://www.beesoft.org/beediff.html
+MASTER_SITES=	http://www.beesoft.org/download/
+
+# GPLv2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=	ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender c \
+		fontconfig freetype glib-2.0 gthread-2.0 iconv intl m png \
+		pthread stdc++ z
+
+LIB_DEPENDS+=	lib/qt4/QtGui::x11/qt4
+
+WRKDIST=	${WRKDIR}/beediff
+
+MODULES=	x11/qt4
+USE_X11=	Yes
+NO_REGRESS=	Yes
+
+MAKE_FLAGS=	CXX=${CXX} \
+		QMAKE_CXXFLAGS="${CXXFLAGS} -g"
+
+do-configure:
+	cd ${WRKSRC} && ${LOCALBASE}/bin/qmake4 -unix beediff.pro
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/beediff ${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/devel/beediff/distinfo b/devel/beediff/distinfo
new file mode 100644
index 00000000000..fb3bfcabdc2
--- /dev/null
+++ b/devel/beediff/distinfo
@@ -0,0 +1,5 @@
+MD5 (beediff_1.5_src.tar.gz) = FToIdxNgaBJtB2tXjz04wQ==
+RMD160 (beediff_1.5_src.tar.gz) = b9zfbQavV2RynD+8KuXzBzeRV+k=
+SHA1 (beediff_1.5_src.tar.gz) = 1SaObH+65mUgHYX6JZQRID/Xrvs=
+SHA256 (beediff_1.5_src.tar.gz) = dqkkyalAZ/1CTYoVH7rvvg4iZy/TuqIttOrNQobekIg=
+SIZE (beediff_1.5_src.tar.gz) = 70094
diff --git a/devel/beediff/patches/patch-beediff_pro b/devel/beediff/patches/patch-beediff_pro
new file mode 100644
index 00000000000..c0a576cb713
--- /dev/null
+++ b/devel/beediff/patches/patch-beediff_pro
@@ -0,0 +1,12 @@
+$OpenBSD: patch-beediff_pro,v 1.1.1.1 2008/03/18 21:26:53 simon Exp $
+--- beediff.pro.orig	Tue Mar 18 12:03:37 2008
++++ beediff.pro	Tue Mar 18 12:03:53 2008
+@@ -1,8 +1,6 @@
+ TEMPLATE =  app
+ CONFIG +=  qt release warn_on x11
+-QMAKE_CXXFLAGS = -march=pentium
+ QMAKE_CXXFLAGS_DEBUG = -O0 -g
+-QMAKE_CXXFLAGS_RELEASE = -O3
+ OBJECTS_DIR =  ./tmp
+ MOC_DIR =  ./tmp
+ SOURCES =  \
diff --git a/devel/beediff/pkg/DESCR b/devel/beediff/pkg/DESCR
new file mode 100644
index 00000000000..df44bad93bb
--- /dev/null
+++ b/devel/beediff/pkg/DESCR
@@ -0,0 +1,3 @@
+BeeDiff is a graphical file comparator.  Users have the possibility to
+compare and merge two text files.  All differences are highlighted in
+colors.
diff --git a/devel/beediff/pkg/PLIST b/devel/beediff/pkg/PLIST
new file mode 100644
index 00000000000..6afa97efe84
--- /dev/null
+++ b/devel/beediff/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2008/03/18 21:26:53 simon Exp $
+bin/beediff