diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 97ca23dd82cb..18119ddbbada 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,48 +1,66 @@
 # New ports collection makefile for:	skite
 # Date created:				27 November 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scite
 PORTVERSION=	1.55
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
 MASTER_SITE_SUBDIR=	scintilla
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A full-featured SCIntilla based Text Editor for GTK/GNOME
 
 LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
+USE_REINPLACE=	yes
+PLIST_SUB=	GNOME_COMMENT=${GNOME_COMMENT}
 
-.if defined(WITH_GTK2)
+.if defined(WITH_GNOME)
+USE_GNOME=	gtk20 gnomeprefix
+PKGNAMESUFFIX=	-gnome
+GNOME_COMMENT=	''
+.elif defined(WITH_GTK2)
 USE_GNOME=	gtk20
 PKGNAMESUFFIX=	-gtk2
 .else
 USE_GNOME=	gtk12
 MAKE_ARGS=	GTK1=yes
 .endif
+GNOME_COMMENT?=	'@comment '
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,$$(CC),$$(CXX),g' ${WRKSRC}/makefile
+.if defined(WITH_GNOME)
+	@${TR} -d "\r" < ${WRKSRC}/SciTE.desktop > ${WRKDIR}/SciTE.desktop
+	@${ECHO_CMD} 'Categories=Application;Development;' >> ${WRKDIR}/SciTE.desktop
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
+.if defined(WITH_GNOME)
+	${INSTALL_DATA} ${WRKDIR}/SciTE.desktop ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/gnome/pixmaps
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 4c29ba12bae2..1459d96ba257 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,54 +1,56 @@
 bin/SciTE
+%%GNOME_COMMENT%%share/gnome/applications/SciTE.desktop
+%%GNOME_COMMENT%%share/gnome/pixmaps/Sci48M.png
 %%PORTDOCS%%%%DOCSDIR%%/PrintHi.png
 %%PORTDOCS%%%%DOCSDIR%%/SciBreak2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/SciTE.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEDirector.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEDoc.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEDownload.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEExtension.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEExtras.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEIco.png
 %%PORTDOCS%%%%DOCSDIR%%/SciTEImage.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTELexer.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTERegEx.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTETranslation.html
 %%PORTDOCS%%%%DOCSDIR%%/SciTEWord.jpg
 %%PORTDOCS%%%%DOCSDIR%%/demo.png
 %%DATADIR%%/Embedded.properties
 %%DATADIR%%/SciTE.properties
 %%DATADIR%%/SciTEGlobal.properties
 %%DATADIR%%/abbrev.properties
 %%DATADIR%%/ada.properties
 %%DATADIR%%/asm.properties
 %%DATADIR%%/ave.properties
 %%DATADIR%%/baan.properties
 %%DATADIR%%/bullant.properties
 %%DATADIR%%/conf.properties
 %%DATADIR%%/cpp.properties
 %%DATADIR%%/css.properties
 %%DATADIR%%/eiffel.properties
 %%DATADIR%%/escript.properties
 %%DATADIR%%/fortran.properties
 %%DATADIR%%/html.properties
 %%DATADIR%%/latex.properties
 %%DATADIR%%/lisp.properties
 %%DATADIR%%/lout.properties
 %%DATADIR%%/lua.properties
 %%DATADIR%%/matlab.properties
 %%DATADIR%%/mmixal.properties
 %%DATADIR%%/nncrontab.properties
 %%DATADIR%%/nsis.properties
 %%DATADIR%%/others.properties
 %%DATADIR%%/pascal.properties
 %%DATADIR%%/perl.properties
 %%DATADIR%%/pov.properties
 %%DATADIR%%/ps.properties
 %%DATADIR%%/python.properties
 %%DATADIR%%/ruby.properties
 %%DATADIR%%/scriptol.properties
 %%DATADIR%%/sql.properties
 %%DATADIR%%/tcl.properties
 %%DATADIR%%/vb.properties
 %%DATADIR%%/yaml.properties
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%