diff --git a/x11/Makefile b/x11/Makefile
index e887fb68f1b4..7ce5557eb538 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -68,6 +68,7 @@
     SUBDIR += enterminus
     SUBDIR += erun
     SUBDIR += eterm
+    SUBDIR += etoile-xwindowserverkit
     SUBDIR += examine
     SUBDIR += fast-user-switch-applet
     SUBDIR += fbdesk
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
new file mode 100644
index 000000000000..d7e8dafa2e3a
--- /dev/null
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:    etoile-xwindowserverkit
+# Date created:         18 Nov 2006
+# Whom:                 dirk.meyer@dinoex.sub.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xwindowserverkit
+PORTVERSION=	0.1.${SNAPSHOT}
+CATEGORIES=	x11
+MASTER_SITES=	http://florida.ethz.ch/ports/distfiles/
+PKGNAMEPREFIX=	etoile-
+DISTNAME=	etoile_0+${SNAPSHOT}+dfsg.orig
+
+MAINTAINER=	dinoex@FreeBSD.org
+COMMENT=	Etoile Project XWindowServerKit frameowrk
+
+SNAPSHOT=	20060917
+WRKSRC=	${WRKDIR}/etoile-0+${SNAPSHOT}+dfsg/Etoile/
+USE_GMAKE=	yes
+USE_GNUSTEP=	yes
+USE_GNUSTEP_PREFIX=	yes
+USE_GNUSTEP_BACK=	yes
+USE_GNUSTEP_BUILD=	yes
+USE_GNUSTEP_INSTALL=	yes
+MAKEFILE=	GNUmakefile
+LDCONFIG_DIRS=	${LOCALLIBDIR}
+INSTALLS_SHLIB=	yes
+NO_FILTER_SHLIBS=	yes
+USE_GNUSTEP_MAKE_DIRS+=	Frameworks/XWindowServerKit
+
+.include <bsd.port.mk>
diff --git a/x11/etoile-xwindowserverkit/distinfo b/x11/etoile-xwindowserverkit/distinfo
new file mode 100644
index 000000000000..2d5c7ccf5d13
--- /dev/null
+++ b/x11/etoile-xwindowserverkit/distinfo
@@ -0,0 +1,3 @@
+MD5 (etoile_0+20060917+dfsg.orig.tar.gz) = bc96dcaba7ac66abb1320d5cfc98f05e
+SHA256 (etoile_0+20060917+dfsg.orig.tar.gz) = de7cb026ccebdbb72d115ca800a13910cd51c9df27f5578ad7059b13f88eb334
+SIZE (etoile_0+20060917+dfsg.orig.tar.gz) = 10478850
diff --git a/x11/etoile-xwindowserverkit/pkg-descr b/x11/etoile-xwindowserverkit/pkg-descr
new file mode 100644
index 000000000000..3ef1f63df79b
--- /dev/null
+++ b/x11/etoile-xwindowserverkit/pkg-descr
@@ -0,0 +1,4 @@
+XWindowServerKit provides access to x window system.
+It allows GNUstep to integrate better with x window system.
+
+WWW: http://www.etoile-project.org/
diff --git a/x11/etoile-xwindowserverkit/pkg-plist b/x11/etoile-xwindowserverkit/pkg-plist
new file mode 100644
index 000000000000..659db76790c7
--- /dev/null
+++ b/x11/etoile-xwindowserverkit/pkg-plist
@@ -0,0 +1,8 @@
+Local/Library/Headers/XWindowServerKit/XFunctions.h
+Local/Library/Headers/XWindowServerKit/XScreen.h
+Local/Library/Headers/XWindowServerKit/XWindow.h
+Local/Library/Headers/XWindowServerKit/gnustep.h
+Local/Library/Libraries/libXWindowServerKit.so
+Local/Library/Libraries/libXWindowServerKit.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libXWindowServerKit.so.%%LIBVERSION%%
+@dirrm Local/Library/Headers/XWindowServerKit