diff --git a/devel/mcs/Makefile b/devel/mcs/Makefile
new file mode 100644
index 00000000000..7d5bf238807
--- /dev/null
+++ b/devel/mcs/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/04/09 07:36:35 steven Exp $
+
+COMMENT=	"abstract the storage of configuration settings"
+
+DISTNAME=	mcs-0.4.1
+
+SHARED_LIBS=	mcs	0.0 \
+		keyfile	0.0
+
+CATEGORIES=	devel
+
+HOMEPAGE=	http://sacredspiral.co.uk/~nenolod/mcs/
+
+# BSD
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=	c
+
+MASTER_SITES=	${HOMEPAGE}
+EXTRACT_SUFX=	.tgz
+
+CONFIGURE_STYLE=gnu
+
+MAKE_ENV=	LIBmcs_VERSION=${LIBmcs_VERSION} \
+		LIBkeyfile_VERSION=${LIBkeyfile_VERSION}
+
+NO_REGRESS=	Yes
+
+.include <bsd.port.mk>
diff --git a/devel/mcs/distinfo b/devel/mcs/distinfo
new file mode 100644
index 00000000000..cc4071004e7
--- /dev/null
+++ b/devel/mcs/distinfo
@@ -0,0 +1,5 @@
+MD5 (mcs-0.4.1.tgz) = 0JtC6dUeoyxjJvC7ythsng==
+RMD160 (mcs-0.4.1.tgz) = VQUaqQhGMvToinsGtIP8dJPQyY4=
+SHA1 (mcs-0.4.1.tgz) = t+TfS6HjbLPcGxVyEF69wV7GLBM=
+SHA256 (mcs-0.4.1.tgz) = vF0mIwUC8rBUbIzdjJgRJ1nBC2x+L37G1J14rojf1t0=
+SIZE (mcs-0.4.1.tgz) = 62922
diff --git a/devel/mcs/patches/patch-mk_init_mk b/devel/mcs/patches/patch-mk_init_mk
new file mode 100644
index 00000000000..ca512aff991
--- /dev/null
+++ b/devel/mcs/patches/patch-mk_init_mk
@@ -0,0 +1,18 @@
+$OpenBSD: patch-mk_init_mk,v 1.1.1.1 2007/04/09 07:36:35 steven Exp $
+--- mk/init.mk.orig	Sun Apr  8 10:38:18 2007
++++ mk/init.mk	Sun Apr  8 10:38:33 2007
+@@ -1,5 +1,5 @@
+ # Shut up GNU make
+-.SILENT:
++#.SILENT:
+ 
+ OBJECTIVE_DIRECTORIES = 
+ OBJECTIVE_LIBS = 
+@@ -16,5 +16,5 @@ SHOW_CFLAGS ?= $(VERBOSE)
+ LIBDIR = $(libdir)
+ BINDIR = $(bindir)
+ INCLUDEDIR = $(pkgincludedir)
+-CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
+-CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
++CFLAGS += -DHAVE_CONFIG_H
++CXXFLAGS += -DHAVE_CONFIG_H
diff --git a/devel/mcs/patches/patch-src_backends_default_Makefile b/devel/mcs/patches/patch-src_backends_default_Makefile
new file mode 100644
index 00000000000..4a06c0955be
--- /dev/null
+++ b/devel/mcs/patches/patch-src_backends_default_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_backends_default_Makefile,v 1.1.1.1 2007/04/09 07:36:35 steven Exp $
+--- src/backends/default/Makefile.orig	Sun Apr  8 10:57:52 2007
++++ src/backends/default/Makefile	Sun Apr  8 10:57:59 2007
+@@ -1,7 +1,7 @@
+ include ../../../mk/rules.mk
+ include ../../../mk/init.mk
+ 
+-OBJECTIVE_LIBS = libkeyfile.so
++OBJECTIVE_LIBS = libkeyfile.so.${LIBkeyfile_VERSION}
+ 
+ LIBDIR = ${libdir}/mcs
+ 
diff --git a/devel/mcs/patches/patch-src_libmcs_Makefile b/devel/mcs/patches/patch-src_libmcs_Makefile
new file mode 100644
index 00000000000..3db28ff81fb
--- /dev/null
+++ b/devel/mcs/patches/patch-src_libmcs_Makefile
@@ -0,0 +1,22 @@
+$OpenBSD: patch-src_libmcs_Makefile,v 1.1.1.1 2007/04/09 07:36:35 steven Exp $
+--- src/libmcs/Makefile.orig	Tue Feb 27 14:40:20 2007
++++ src/libmcs/Makefile	Sun Apr  8 10:53:22 2007
+@@ -3,8 +3,7 @@ include ../../mk/init.mk
+ 
+ PICLDFLAGS = $(LIBLDFLAGS)
+ 
+-OBJECTIVE_LIBS = libmcs$(SHARED_SUFFIX)
+-OBJECTIVE_SONAME_SUFFIX = 1
++OBJECTIVE_LIBS = libmcs$(SHARED_SUFFIX).${LIBmcs_VERSION}
+ 
+ LIBADD += $(DYNAMIC_LD_LIBS)
+ 
+@@ -28,8 +27,3 @@ HEADERS = mcs.h mcs_config.h
+ include ../../mk/objective.mk
+ 
+ install-posthook:
+-	@mv ${DESTDIR}/${LIBDIR}/libmcs$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libmcs$(SHARED_SUFFIX).1.0.0
+-	@ln -sf libmcs$(SHARED_SUFFIX).1.0.0 \
+-		${DESTDIR}/${LIBDIR}/libmcs$(SHARED_SUFFIX).1
+-	@ln -sf libmcs$(SHARED_SUFFIX).1 \
+-		${DESTDIR}/${LIBDIR}/libmcs$(SHARED_SUFFIX)
diff --git a/devel/mcs/pkg/DESCR b/devel/mcs/pkg/DESCR
new file mode 100644
index 00000000000..1858efafa76
--- /dev/null
+++ b/devel/mcs/pkg/DESCR
@@ -0,0 +1,10 @@
+mcs is a library and set of userland tools which abstract the
+storage of configuration settings away from userland applications.
+
+It is hoped that by using mcs, that the applications which use it
+will generally have a more congruent feeling in regards to settings.
+
+There have been other projects like this before (such as GConf), but
+unlike those projects, mcs strictly handles abstraction. It does not
+impose any specific data storage requirement, nor is it tied to any
+desktop environment or software suite.
diff --git a/devel/mcs/pkg/PFRAG.shared b/devel/mcs/pkg/PFRAG.shared
new file mode 100644
index 00000000000..2bd01bd50b0
--- /dev/null
+++ b/devel/mcs/pkg/PFRAG.shared
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/04/09 07:36:35 steven Exp $
+@lib lib/libmcs.so.${LIBmcs_VERSION}
+@lib lib/mcs/libkeyfile.so.${LIBkeyfile_VERSION}
diff --git a/devel/mcs/pkg/PLIST b/devel/mcs/pkg/PLIST
new file mode 100644
index 00000000000..03051a124dc
--- /dev/null
+++ b/devel/mcs/pkg/PLIST
@@ -0,0 +1,12 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/09 07:36:35 steven Exp $
+%%SHARED%%
+bin/mcs-getconfval
+bin/mcs-info
+bin/mcs-query-backends
+bin/mcs-setconfval
+include/libmcs/
+include/libmcs/mcs.h
+include/libmcs/mcs_config.h
+lib/mcs/
+lib/pkgconfig/
+lib/pkgconfig/libmcs.pc