diff --git a/devel/cunit/Makefile b/devel/cunit/Makefile
new file mode 100644
index 00000000000..015bb5b75d9
--- /dev/null
+++ b/devel/cunit/Makefile
@@ -0,0 +1,30 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2008/08/29 09:18:39 sthen Exp $
+
+COMMENT =		c unit testing framework
+
+VER =			2.1-0
+DISTNAME =		CUnit-${VER}
+PKGNAME =		cunit-${VER:S/-/./}
+
+SHARED_LIBS =		cunit	0.0
+
+CATEGORIES =		devel
+
+HOMEPAGE =		http://cunit.sourceforge.net/
+
+MAINTAINER =		Markus Bergkvist <markus.bergkvist@telia.com>
+
+# LGPL
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=cunit/}
+EXTRACT_SUFX =		-src.tar.gz
+
+USE_LIBTOOL =		Yes
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS +=	--enable-curses
+
+.include <bsd.port.mk>
diff --git a/devel/cunit/distinfo b/devel/cunit/distinfo
new file mode 100644
index 00000000000..c5ffcd55b9d
--- /dev/null
+++ b/devel/cunit/distinfo
@@ -0,0 +1,5 @@
+MD5 (CUnit-2.1-0-src.tar.gz) = 9PU9LEHpMVqRtPFKFwb+Tw==
+RMD160 (CUnit-2.1-0-src.tar.gz) = 2z6OoilPqugwG1lxZPB/5ILod7U=
+SHA1 (CUnit-2.1-0-src.tar.gz) = BZIMHe/aNSfO47yC+56t9Fxep6E=
+SHA256 (CUnit-2.1-0-src.tar.gz) = tfwKsPA+jSh6P2WTXH42+r/c2fkm7m9QrGIepqtvqMY=
+SIZE (CUnit-2.1-0-src.tar.gz) = 628767
diff --git a/devel/cunit/patches/patch-doc_Makefile_in b/devel/cunit/patches/patch-doc_Makefile_in
new file mode 100644
index 00000000000..7773ad2048c
--- /dev/null
+++ b/devel/cunit/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2008/08/29 09:18:39 sthen Exp $
+--- doc/Makefile.in.orig	Wed Jun 25 12:19:22 2008
++++ doc/Makefile.in	Wed Jun 25 12:22:27 2008
+@@ -192,7 +192,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdir = $(prefix)/doc/@PACKAGE@
++docdir = $(prefix)/share/doc/@PACKAGE@
+ doc_DATA = \
+ 	CUnit_doc.css \
+ 	error_handling.html \
diff --git a/devel/cunit/patches/patch-doc_headers_Makefile_in b/devel/cunit/patches/patch-doc_headers_Makefile_in
new file mode 100644
index 00000000000..c1d55aa5f04
--- /dev/null
+++ b/devel/cunit/patches/patch-doc_headers_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_headers_Makefile_in,v 1.1.1.1 2008/08/29 09:18:39 sthen Exp $
+--- doc/headers/Makefile.in.orig	Wed Jun 25 12:20:20 2008
++++ doc/headers/Makefile.in	Wed Jun 25 12:22:48 2008
+@@ -183,7 +183,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-dochdrdir = $(prefix)/doc/@PACKAGE@/headers
++dochdrdir = $(prefix)/share/doc/@PACKAGE@/headers
+ INCLUDE_FILES = \
+ 	Automated.h \
+ 	Basic.h \
diff --git a/devel/cunit/pkg/DESCR b/devel/cunit/pkg/DESCR
new file mode 100644
index 00000000000..ed0b5d94eaa
--- /dev/null
+++ b/devel/cunit/pkg/DESCR
@@ -0,0 +1,7 @@
+CUnit is a lightweight system for writing, administering, and running
+unit tests in C.  It provides C programmers a basic testing
+functionality with a flexible variety of user interfaces.  It uses a
+simple framework for building test structures, and provides a rich set
+of assertions for testing common data types.   In addition, several
+different interfaces are provided for running tests and reporting
+results.
diff --git a/devel/cunit/pkg/PFRAG.shared b/devel/cunit/pkg/PFRAG.shared
new file mode 100644
index 00000000000..4365387747d
--- /dev/null
+++ b/devel/cunit/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/08/29 09:18:39 sthen Exp $
+@lib lib/libcunit.so.${LIBcunit_VERSION}
diff --git a/devel/cunit/pkg/PLIST b/devel/cunit/pkg/PLIST
new file mode 100644
index 00000000000..70290315a4e
--- /dev/null
+++ b/devel/cunit/pkg/PLIST
@@ -0,0 +1,45 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2008/08/29 09:18:39 sthen Exp $
+%%SHARED%%
+include/CUnit/
+include/CUnit/Automated.h
+include/CUnit/Basic.h
+include/CUnit/CUCurses.h
+include/CUnit/CUError.h
+include/CUnit/CUnit.h
+include/CUnit/Console.h
+include/CUnit/MyMem.h
+include/CUnit/TestDB.h
+include/CUnit/TestRun.h
+include/CUnit/Util.h
+lib/libcunit.a
+lib/libcunit.la
+@man man/man3/CUnit.3
+share/CUnit/
+share/CUnit/CUnit-List.dtd
+share/CUnit/CUnit-List.xsl
+share/CUnit/CUnit-Run.dtd
+share/CUnit/CUnit-Run.xsl
+share/CUnit/Memory-Dump.dtd
+share/CUnit/Memory-Dump.xsl
+share/doc/CUnit/
+share/doc/CUnit/CUnit_doc.css
+share/doc/CUnit/error_handling.html
+share/doc/CUnit/fdl.html
+share/doc/CUnit/headers/
+share/doc/CUnit/headers/Automated.h
+share/doc/CUnit/headers/Basic.h
+share/doc/CUnit/headers/CUCurses.h
+share/doc/CUnit/headers/CUError.h
+share/doc/CUnit/headers/CUnit.h
+share/doc/CUnit/headers/Console.h
+share/doc/CUnit/headers/MyMem.h
+share/doc/CUnit/headers/TestDB.h
+share/doc/CUnit/headers/TestRun.h
+share/doc/CUnit/headers/Util.h
+share/doc/CUnit/headers/Win.h
+share/doc/CUnit/index.html
+share/doc/CUnit/introduction.html
+share/doc/CUnit/managing_tests.html
+share/doc/CUnit/running_tests.html
+share/doc/CUnit/test_registry.html
+share/doc/CUnit/writing_tests.html