diff --git a/devel/c-unit/Makefile b/devel/c-unit/Makefile
index 1b4fd93d18a8..f8774c8f2b4a 100644
--- a/devel/c-unit/Makefile
+++ b/devel/c-unit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	c-unit
 DISTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -18,6 +19,9 @@ USES=		gmake libtool pathfix
 USE_AUTOTOOLS=	aclocal autoconf autoheader automake libtoolize
 USE_LDCONFIG=	yes
 
+DATADIR=	${PREFIX}/share/CUnit
+EXAMPLESDIR=	${PREFIX}/share/examples/CUnit
+
 AUTOMAKE_ARGS=	--add-missing
 LIBTOOLIZE_ARGS=--copy --force --install
 PATHFIX_MAKEFILEIN=	Makefile.am
diff --git a/devel/c-unit/pkg-plist b/devel/c-unit/pkg-plist
index 49a840f1c749..fe17a869a0ba 100644
--- a/devel/c-unit/pkg-plist
+++ b/devel/c-unit/pkg-plist
@@ -1,8 +1,9 @@
-include/CUnit/Automated.h
-include/CUnit/Basic.h
+%%AUT%%include/CUnit/Automated.h
+%%BAS%%include/CUnit/Basic.h
+%%CON%%include/CUnit/Console.h
+%%CUR%%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
@@ -12,11 +13,23 @@ lib/libcunit.so
 lib/libcunit.so.1
 lib/libcunit.so.1.0.1
 man/man3/CUnit.3.gz
-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
+%%DATADIR%%/CUnit-List.dtd
+%%DATADIR%%/CUnit-List.xsl
+%%DATADIR%%/CUnit-Run.dtd
+%%DATADIR%%/CUnit-Run.xsl
+%%DATADIR%%/Memory-Dump.dtd
+%%DATADIR%%/Memory-Dump.xsl
+%%ITE%%%%DATADIR%%/Test/test_cunit
+%%EXA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Automated/AutomatedTest
+%%EXA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Automated/README
+%%EXA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/BasicTest
+%%EXA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Basic/README
+%%EXA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Console/ConsoleTest
+%%EXA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Console/README
 @dirrmtry include/CUnit
-@dirrmtry share/CUnit
+%%ITE%%@dirrmtry %%DATADIR%%/Test
+@dirrmtry %%DATADIR%%
+%%EXA%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Automated
+%%EXA%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Basic
+%%EXA%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Console
+%%EXA%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%