2 files changed, 16 insertions, 5 deletions

diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index 1e4782780ffe..6c200e2658ac 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep-app
 PORTVERSION=	1.13.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -38,6 +38,7 @@ USE_GNUSTEP_SYSTEM_LIBS+=	\
 	ExtendedWorkspace:deskutils/etoile-extendedworkspacekit \
 	ServicesBarKit:deskutils/etoile-servicesbarkit \
 	IconKit:x11-themes/etoile-iconkit \
+	XWindowServerKit:x11/etoile-xwindowserverkit \
 
 USE_GNUSTEP_LOCAL_LIBS+=	\
 	Pantomime:mail/pantomime \
@@ -56,6 +57,7 @@ USE_GNUSTEP_LOCAL_LIBS+=	\
 	ObjcUnit:devel/objcunit \
 	GSKrab:x11/gskrab \
 	UnitKit:devel/etoile-unitkit \
+	BookmarkKit:www/etoile-bookmarkkit \
 	RSSKit:www/etoile-rsskit \
 	Encore:devel/fortytwo-encore \
 	BDB:databases/fortytwo-bdb \
@@ -67,9 +69,17 @@ USE_GNUSTEP_LOCAL_LIBS+=	\
 	Tryst:net/tryst \
 	OgreKit:textproc/etoile-ogrekit \
 	LuceneKit:textproc/etoile-lucenekit \
+	CollectionKit:devel/etoile-collectionkit \
+	EtoileFoundation:devel/etoile-foundation \
+	PaneKit:deskutils/etoile-panekit \
+	WorkspaceCommKit:sysutils/etoile-system \
+	SystemConfig:deskutils/etoile-systemconfig \
+	MultimediaKit:multimedia/etoile-multimediakit \
+	EtoileUI:deskutils/etoile-ui \
 
 USE_GNUSTEP_SYSTEM_BUNDLES+=	\
 	EtoileMenus:x11-themes/etoile-etoilemenus \
+	EtoileBehavior:sysutils/etoile-behavior \
 
 USE_GNUSTEP_LOCAL_BUNDLES+=	\
 	Cddb:audio/cddb-bundle	\
@@ -141,7 +151,7 @@ USE_GNUSTEP_LOCAL_APPS+=	\
 	GMines:games/gmines \
 	InnerSpace:x11/innerspace \
 	FTP:ftp/gnustep-ftp \
-	DictionaryReader:deskutils/etoile \
+	DictionaryReader:deskutils/etoile-dictionaryreader \
 	batmon:sysutils/batmon \
 	UL:biology/adun \
 	RemoteDesk:net/remotedesk \
diff --git a/x11/gnustep-app/pkg-descr b/x11/gnustep-app/pkg-descr
index 19977ebc15fa..20287306ac58 100644
--- a/x11/gnustep-app/pkg-descr
+++ b/x11/gnustep-app/pkg-descr
@@ -7,7 +7,8 @@ Local libs:	Pantomime, GToolKit, rigs, Addresses, SlideShow, netclasses,
 WizardKit, HighlighterKit, Performance, SQLClient, WebServer, StepTalk,
 MathArray, ObjcUnit, WildMenus, GSKrab, Cddb, UnitKit, XWindowServerKit,
 RSSKit, EtoileExtensions, Encore, BDB, FortyTwo, ObjectiveLib, PopplerKit,
-MP3ToWav, CameraKit, Tryst
+MP3ToWav, CameraKit, Tryst, CollectionKit, EtoileFoundation, PaneKit,
+WorkspaceCommKit, SystemConfig, MultimediaKit, EtoileUI, EtoileBehavior
 
 System apps:	Gorm, GShisen, ProjectCenter, Preferences, GWorkspace,
 guile-gui, gui, TextEdit, TimeMon, Terminal, Emacs, GSPdf, SystemPreferences,
@@ -22,9 +23,9 @@ GTAMSAnalyzer, Paje, AClock, PhotoClip, LapisPuzzle, Waiho, Affiche,
 ProjectManager, GMastermind2, GPuzzle2, Ticker, NoteBook, HelpViewer, Duncan,
 Jishyo, GMines, InnerSpace, FTP, DictionaryReader, batmon, Adun, RemoteDesk,
 DisplayCalibrator, GNUWash, Poe, MPDCon, PlopFolio, CDPlayer, Burn, GScheme,
-Mplayer, MyLibrary, NeXTGo, Grr, iTerm, Installer, Hardware, LookAndBehavior,
+Mplayer, MyLibrary, NeXTGo, iTerm, Installer, Hardware, LookAndBehavior,
 Azalea, EtoileMenuServer, Expense, FreeTar, CodeEditor, Localize,
 AddressManager, GSBench, SVGViewer, Vindaloo, Digibux, AppWrapper, Pixen,
 MyWiki, Cartotheque, LuserNET, Popup, Toolbox, Fortunate, TBrowser, TChat
 
-Local tools:	zillion, adtool
+Local tools:	zillion, adtool, etoile_system