diff --git a/editors/sublime3/Makefile b/editors/sublime3/Makefile
index 28f42b7cdfa1..5327fec66408 100644
--- a/editors/sublime3/Makefile
+++ b/editors/sublime3/Makefile
@@ -1,49 +1,50 @@
 # Created by: Miguel Clara <miguelmclara@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	sublime
 PORTVERSION=	3.0.83
+PORTREVISION=	1
 CATEGORIES=	editors linux
 MASTER_SITES=	http://c758482.r82.cf2.rackcdn.com/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	sublime_text_3_build_3083_x32
 
 MAINTAINER=	miguelmclara@gmail.com
 COMMENT=	Sophisticated text editor for code, markup and prose
 
-USES=		tar:bzip2 desktop-file-utils
+USES=		desktop-file-utils tar:bzip2
+USE_LINUX=	c6
+USE_LINUX_APPS=	xorglibs gtk2
+
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/sublime_text_3
 
 CONFLICTS=	linux-sublime-[0-24-9]*
 
 NO_BUILD=
 SUB_FILES=	sublime
 
-USE_LINUX=	c6
-USE_LINUX_APPS=	xorglibs gtk2
-
 post-patch:
 	${BRANDELF} -t Linux ${WRKSRC}/sublime_text
 	${BRANDELF} -t Linux ${WRKSRC}/plugin_host
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/ \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
 
 	${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
 	${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
 	${INSTALL_DATA} ${WRKSRC}/sublime_text.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
 	${CHMOD} +x ${STAGEDIR}${DATADIR}/plugin_host
 	${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
 
 .include <bsd.port.mk>
diff --git a/editors/sublime3/files/patch-sublime_text.desktop b/editors/sublime3/files/patch-sublime_text.desktop
index d97afcd7e10f..0814f17c9381 100644
--- a/editors/sublime3/files/patch-sublime_text.desktop
+++ b/editors/sublime3/files/patch-sublime_text.desktop
@@ -1,24 +1,24 @@
---- sublime_text.desktop.orig	2014-08-27 
-+++ sublime_text.desktop	
-@@ -4,20 +4,9 @@
+--- sublime_text.desktop.orig	2015-03-26 07:23:04 UTC
++++ sublime_text.desktop
+@@ -4,20 +4,9 @@ Type=Application
  Name=Sublime Text
  GenericName=Text Editor
  Comment=Sophisticated text editor for code, markup and prose
 -Exec=/opt/sublime_text/sublime_text %F
 +Exec=sublime %F
  Terminal=false
  MimeType=text/plain;
  Icon=sublime-text
  Categories=TextEditor;Development;
  StartupNotify=true
 -Actions=Window;Document;
 -
 -[Desktop Action Window]
 -Name=New Window
 -Exec=/opt/sublime_text/sublime_text -n
 -OnlyShowIn=Unity;
 -
 -[Desktop Action Document]
 -Name=New File
 -Exec=/opt/sublime_text/sublime_text --command new_file
 -OnlyShowIn=Unity;
diff --git a/editors/sublime3/files/sublime.in b/editors/sublime3/files/sublime.in
index aede3704b63a..75390fe6ffc9 100644
--- a/editors/sublime3/files/sublime.in
+++ b/editors/sublime3/files/sublime.in
@@ -1,15 +1,15 @@
 #!/compat/linux/bin/sh
 if [ -L "/dev/shm" ];then
-	%%DATADIR%%/sublime_text $*
+	%%DATADIR%%/sublime_text "$@"
 else
         echo    "Some Linux applications use shared memory.
 
 Sublime Text 3 can not function without it, you need to set up a link 
 from /dev/shm to a suitable place, e.g. by adding the following line
 to /etc/devfs.conf (takes effect on each boot - restart devfs to apply
 then change now):
         link /tmp shm
 "
         exit 1;
 fi