diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 1579da978335..63795eedd5b8 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lazarus
 PORTVERSION=	0.9.26.2
+PORTREVISION=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/-0/}
@@ -22,16 +23,18 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	#
-WANT_FPC_ALL=	yes
+USE_FPC=	fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-xml \
+		iconvenc pasjpeg x11
 
 MAKE_ENV=	OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib ${OPT_EXTRA}"
 MAN1=		lazarus-ide.1 lazbuild.1 startlazarus.1
 PLIST=		${WRKDIR}/pkg-plist
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTSDIR="${PORTSDIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS=	GTK2	"Use gtk20 interface instead of gtk12"	off \
-		QT4	"Use qt4 interface" off \
-		BIGIDE	"Compile additional components"	off
+OPTIONS=	GTK2	"Use gtk20 interface instead of gtk12"	on \
+		QT4	"Use qt4 interface" off
 
 .include <bsd.port.pre.mk>
 
@@ -40,9 +43,11 @@ IGNORE=		Please select only one option QT4 or GTK2, don't select both options
 .endif
 
 .if defined(WITH_GTK2)
+USE_FPC+=	gtk2
 USE_GNOME=	gtk20
 LCL_PLATFORM=	gtk2
 .else
+USE_FPC+=	gtk1
 USE_GNOME=	gtk12 gdkpixbuf
 LCL_PLATFORM=	gtk
 .endif
@@ -53,10 +58,6 @@ LCL_PLATFORM=	qt
 OPT_EXTRA=	"-dUSE_QT_44"
 .endif
 
-.if defined(WITH_BIGIDE)
-LAZARUS_TARGET=	bigide lazbuilder
-.endif
-
 post-extract:
 	@${MKDIR} ${WRKDIR}/man1
 	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
@@ -71,7 +72,7 @@ post-patch:
 
 do-build:
 	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_PLATFORM} ${LAZARUS_TARGET}
+		${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_PLATFORM}
 
 post-build:
 	@cd ${WRKSRC} && \
@@ -85,7 +86,7 @@ pre-install:
 
 	@${RM} -f ${PLIST}
 
-.	for FILE in bin/lazarus bin/lazbuild
+.	for FILE in bin/lazarus bin/lazbuild etc/lazbuild.cfg
 		@${ECHO_CMD} ${FILE} >> ${PLIST}
 .	endfor
 
@@ -146,4 +147,10 @@ do-install:
 .endfor
 	${LN} -s ${DATADIR}/lazbuild ${PREFIX}/bin/lazbuild
 
+	@${ECHO_CMD} "# Current lazarus interface" > ${PREFIX}/etc/lazbuild.cfg
+	@${ECHO_CMD} "LCL_PLATFORM=${LCL_PLATFORM}" >> ${PREFIX}/etc/lazbuild.cfg
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/editors/lazarus/files/pkg-message.in b/editors/lazarus/files/pkg-message.in
new file mode 100644
index 000000000000..2a65d44d4f6b
--- /dev/null
+++ b/editors/lazarus/files/pkg-message.in
@@ -0,0 +1,26 @@
+###############################################################################
+
+The Lazarus RAD was installed
+
+1) You can run it using:
+
+   # lazarus
+
+2) The first time that lazarus is running, you should set the path to fpc 
+   source directory at lazarus configuration environment. Also it could be 
+   setting later.
+
+3) You can obtain freepascal source code from:
+
+   %%PORTSDIR%%/distfiles/freepascal
+
+   It could be extracted to your home directory.
+
+4) A lazbuild.cfg file is installed at ${PREFIX}/etc directory. It contains the
+   current value of LCL_PLATFORM (gtk, gtk2, qt), it is the interface used by 
+   Lazarus. This value will be used by some ports that depend of Lazarus and
+   those will be compiled using the interface defined by LCL_PLATFORM.
+
+5) Enjoy it ;)
+
+###############################################################################