diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 37614b9dd969..20451dae8c0c 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,50 +1,50 @@
 # New ports collection makefile for:	lbreakout2
 # Date created:		12 June 2002
 # Whom:			verm@drunkmonk.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	lbreakout2
-DISTVERSION=	2.6beta-3
-PORTREVISION=	2
+PORTVERSION=	2.6
 CATEGORIES=	games
-MASTER_SITES=	SF/lgames/${PORTNAME}/2.6
+MASTER_SITES=	SF/lgames/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	mmendez@gmail.com
 COMMENT=	The polished successor to LBreakout
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_SDL=	mixer net sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-sdl-net \
 		--localstatedir=/var/games \
 		--disable-nls
+MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|== "-D|= "-D|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|client docs|client|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|: install-data-local|:|g' ${WRKSRC}/client/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/client/empty.hscr ${DATADIR}
 	@${CHOWN} root:games ${PREFIX}/bin/lbreakout2
 	@${CHMOD} g+s ${PREFIX}/bin/lbreakout2
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
 .endif
 	@${SETENV} "PKG_PREFIX=${PREFIX}" \
-		${SH} pkg-install ${PKGNAME} POST-INSTALL
+		${SH} ${.CURDIR}/pkg-install ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/games/lbreakout2/distinfo b/games/lbreakout2/distinfo
index 085deaa3fb08..889581153818 100644
--- a/games/lbreakout2/distinfo
+++ b/games/lbreakout2/distinfo
@@ -1,3 +1,3 @@
-MD5 (lbreakout2-2.6beta-3.tar.gz) = fd0c6a5760a995e8f38cb13e103dddc1
-SHA256 (lbreakout2-2.6beta-3.tar.gz) = 43e063f9808db59b51c5493c1842daf26ed3e1268019b26bc4c2e938d14d3694
-SIZE (lbreakout2-2.6beta-3.tar.gz) = 3159168
+MD5 (lbreakout2-2.6.tar.gz) = fc5ae1e340953fdb9e35fd3e40dfc87f
+SHA256 (lbreakout2-2.6.tar.gz) = 4f5d35a99b543cef1d8940823ab08c637a99b8142ad6c6b53926431868289f55
+SIZE (lbreakout2-2.6.tar.gz) = 3355988
diff --git a/games/lbreakout2/pkg-plist b/games/lbreakout2/pkg-plist
index cc30357b4923..52fda2912b15 100644
--- a/games/lbreakout2/pkg-plist
+++ b/games/lbreakout2/pkg-plist
@@ -1,290 +1,313 @@
 bin/lbreakout2
 bin/lbreakout2server
 %%PORTDOCS%%%%DOCSDIR%%/b0.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/b6.jpg
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/screen.jpg
 %%PORTDOCS%%%%DOCSDIR%%/warp.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x0.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x10.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x11.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x12.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x13.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x14.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x15.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x16.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x17.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x18.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x19.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x20.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x21.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x22.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x23.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x6.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x7.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x8.jpg
 %%PORTDOCS%%%%DOCSDIR%%/x9.jpg
 @unexec if cmp -s %D/%%DATADIR%%/empty.hscr /var/games/lbreakout2.hscr; then rm -f /var/games/lbreakout2.hscr; else true; fi
 %%DATADIR%%/empty.hscr
 %%DATADIR%%/gfx/AbsoluteB/ABOUT
 %%DATADIR%%/gfx/AbsoluteB/README
 %%DATADIR%%/gfx/AbsoluteB/back0.png
 %%DATADIR%%/gfx/AbsoluteB/back1.png
 %%DATADIR%%/gfx/AbsoluteB/back2.png
 %%DATADIR%%/gfx/AbsoluteB/back3.png
 %%DATADIR%%/gfx/AbsoluteB/back4.png
 %%DATADIR%%/gfx/AbsoluteB/back5.png
 %%DATADIR%%/gfx/AbsoluteB/bricks.png
 %%DATADIR%%/gfx/AbsoluteB/extras.png
 %%DATADIR%%/gfx/AbsoluteB/fr_left.png
 %%DATADIR%%/gfx/AbsoluteB/fr_right.png
 %%DATADIR%%/gfx/AbsoluteB/fr_top.png
 %%DATADIR%%/gfx/AbsoluteB/life.png
 %%DATADIR%%/gfx/AbsoluteB/menuback.png
 %%DATADIR%%/gfx/AbsoluteB/paddle.png
 %%DATADIR%%/gfx/AbsoluteB/shot.png
 %%DATADIR%%/gfx/AbsoluteB/weapon.png
 %%DATADIR%%/gfx/Classic/ABOUT
 %%DATADIR%%/gfx/Moiree/ABOUT
 %%DATADIR%%/gfx/Moiree/back0.png
 %%DATADIR%%/gfx/Moiree/back1.png
 %%DATADIR%%/gfx/Moiree/back2.png
 %%DATADIR%%/gfx/Moiree/back3.png
 %%DATADIR%%/gfx/Moiree/back4.png
 %%DATADIR%%/gfx/Moiree/back5.png
 %%DATADIR%%/gfx/Moiree/bricks.png
 %%DATADIR%%/gfx/Moiree/extras.png
 %%DATADIR%%/gfx/Moiree/fr_left.png
 %%DATADIR%%/gfx/Moiree/fr_mp_left.png
 %%DATADIR%%/gfx/Moiree/fr_mp_right.png
 %%DATADIR%%/gfx/Moiree/fr_right.png
 %%DATADIR%%/gfx/Moiree/fr_top.png
 %%DATADIR%%/gfx/Moiree/life.png
 %%DATADIR%%/gfx/Moiree/paddle.png
 %%DATADIR%%/gfx/Oz/README
 %%DATADIR%%/gfx/Oz/back0.png
 %%DATADIR%%/gfx/Oz/back1.png
 %%DATADIR%%/gfx/Oz/back2.png
 %%DATADIR%%/gfx/Oz/back3.png
 %%DATADIR%%/gfx/Oz/back4.png
 %%DATADIR%%/gfx/Oz/bricks.png
 %%DATADIR%%/gfx/Oz/fr_left.png
 %%DATADIR%%/gfx/Oz/fr_right.png
 %%DATADIR%%/gfx/Oz/fr_top.png
 %%DATADIR%%/gfx/Oz/life.png
 %%DATADIR%%/gfx/Oz/paddle.png
 %%DATADIR%%/gfx/ammo.png
 %%DATADIR%%/gfx/back0.png
 %%DATADIR%%/gfx/back1.png
 %%DATADIR%%/gfx/back2.png
 %%DATADIR%%/gfx/back3.png
 %%DATADIR%%/gfx/back4.png
 %%DATADIR%%/gfx/back5.png
 %%DATADIR%%/gfx/ball.png
 %%DATADIR%%/gfx/balloon.png
 %%DATADIR%%/gfx/balloon_peek.png
 %%DATADIR%%/gfx/bricks.png
 %%DATADIR%%/gfx/buttons.png
 %%DATADIR%%/gfx/confirm_buttons.png
 %%DATADIR%%/gfx/cr_back.png
 %%DATADIR%%/gfx/explosions.png
 %%DATADIR%%/gfx/explosions_dark.png
 %%DATADIR%%/gfx/extras.png
 %%DATADIR%%/gfx/f_frame.png
 %%DATADIR%%/gfx/f_game.png
 %%DATADIR%%/gfx/f_small_red.png
 %%DATADIR%%/gfx/f_small_white.png
 %%DATADIR%%/gfx/f_small_yellow.png
 %%DATADIR%%/gfx/f_tiny_black.png
 %%DATADIR%%/gfx/f_white.png
 %%DATADIR%%/gfx/f_yellow.png
 %%DATADIR%%/gfx/fr_hori.png
 %%DATADIR%%/gfx/fr_left.png
 %%DATADIR%%/gfx/fr_llc.png
 %%DATADIR%%/gfx/fr_luc.png
 %%DATADIR%%/gfx/fr_mp_left.png
 %%DATADIR%%/gfx/fr_mp_right.png
 %%DATADIR%%/gfx/fr_right.png
 %%DATADIR%%/gfx/fr_rlc.png
 %%DATADIR%%/gfx/fr_ruc.png
 %%DATADIR%%/gfx/fr_top.png
 %%DATADIR%%/gfx/fr_vert.png
 %%DATADIR%%/gfx/life.png
 %%DATADIR%%/gfx/loading.png
 %%DATADIR%%/gfx/menuback.png
 %%DATADIR%%/gfx/nukeback.png
 %%DATADIR%%/gfx/paddle.png
 %%DATADIR%%/gfx/scroll_down.png
 %%DATADIR%%/gfx/scroll_track.png
 %%DATADIR%%/gfx/scroll_up.png
 %%DATADIR%%/gfx/sel_frame.png
 %%DATADIR%%/gfx/shine.png
 %%DATADIR%%/gfx/shot.png
 %%DATADIR%%/gfx/warp.png
 %%DATADIR%%/gfx/weapon.png
 %%DATADIR%%/gfx/win_icon.png
 %%DATADIR%%/gui_theme/box_frame.png
 %%DATADIR%%/gui_theme/box_wallpaper.png
 %%DATADIR%%/gui_theme/button_frame_clicked.png
 %%DATADIR%%/gui_theme/button_frame_normal.png
 %%DATADIR%%/gui_theme/button_wallpaper_focused.png
 %%DATADIR%%/gui_theme/button_wallpaper_normal.png
 %%DATADIR%%/gui_theme/checkbox.png
 %%DATADIR%%/gui_theme/click.wav
 %%DATADIR%%/gui_theme/edit.wav
 %%DATADIR%%/gui_theme/font.png
 %%DATADIR%%/gui_theme/list_item_color.png
 %%DATADIR%%/gui_theme/progress_high.png
 %%DATADIR%%/gui_theme/progress_low.png
 %%DATADIR%%/gui_theme/progress_medium.png
 %%DATADIR%%/gui_theme/scrollbar_arrows.png
 %%DATADIR%%/gui_theme/spinbutton_arrows.png
 %%DATADIR%%/gui_theme/widget_frame.png
 %%DATADIR%%/gui_theme/widget_wallpaper.png
+%%DATADIR%%/levels/1010011010
 %%DATADIR%%/levels/Abc
 %%DATADIR%%/levels/Afl
 %%DATADIR%%/levels/Alex
 %%DATADIR%%/levels/Arcade
 %%DATADIR%%/levels/Arkanoid
 %%DATADIR%%/levels/BeOS-4ever
 %%DATADIR%%/levels/Biolab428
+%%DATADIR%%/levels/Blues
 %%DATADIR%%/levels/Bombs
 %%DATADIR%%/levels/CalendarFun
 %%DATADIR%%/levels/Chaos
+%%DATADIR%%/levels/Choices
 %%DATADIR%%/levels/Color
 %%DATADIR%%/levels/Composers
+%%DATADIR%%/levels/Circle
+%%DATADIR%%/levels/D2K
+%%DATADIR%%/levels/Daves
 %%DATADIR%%/levels/Demons
 %%DATADIR%%/levels/Family
+%%DATADIR%%/levels/Fantaisie
 %%DATADIR%%/levels/FatalDoomsday
 %%DATADIR%%/levels/Flower
 %%DATADIR%%/levels/Fly
 %%DATADIR%%/levels/Freek
+%%DATADIR%%/levels/FunCity
 %%DATADIR%%/levels/Gatinha
 %%DATADIR%%/levels/GreenWall
 %%DATADIR%%/levels/GreenWall2
 %%DATADIR%%/levels/GreenWall3
 %%DATADIR%%/levels/GreenWall4
 %%DATADIR%%/levels/Hans
 %%DATADIR%%/levels/HereWeGo
 %%DATADIR%%/levels/Heroes
 %%DATADIR%%/levels/HighBall
 %%DATADIR%%/levels/Holidays
 %%DATADIR%%/levels/Hommage
 %%DATADIR%%/levels/Impossibility
 %%DATADIR%%/levels/IoriYagami
 %%DATADIR%%/levels/Iris
 %%DATADIR%%/levels/IrrenhausAh
+%%DATADIR%%/levels/Izusiowe
 %%DATADIR%%/levels/Kazan-1
 %%DATADIR%%/levels/Kevin
 %%DATADIR%%/levels/LBreakout1
 %%DATADIR%%/levels/LBreakout2
 %%DATADIR%%/levels/Lapis
 %%DATADIR%%/levels/Lattsville
 %%DATADIR%%/levels/LinuxFun
 %%DATADIR%%/levels/Lord
 %%DATADIR%%/levels/Maze
 %%DATADIR%%/levels/Megadoomer
+%%DATADIR%%/levels/Negundoid
+%%DATADIR%%/levels/NewOERG1
 %%DATADIR%%/levels/NES
 %%DATADIR%%/levels/N_Arenas
 %%DATADIR%%/levels/N_Snapshots
 %%DATADIR%%/levels/OpenSource
+%%DATADIR%%/levels/OurWorld
 %%DATADIR%%/levels/Pabelo
 %%DATADIR%%/levels/Pawset
 %%DATADIR%%/levels/Ph33r
+%%DATADIR%%/levels/PlayAgain
+%%DATADIR%%/levels/Popcorn
 %%DATADIR%%/levels/R-World
 %%DATADIR%%/levels/Runes
+%%DATADIR%%/levels/Sadistic
 %%DATADIR%%/levels/Shimitar
 %%DATADIR%%/levels/Silly
 %%DATADIR%%/levels/SkillShot
+%%DATADIR%%/levels/Smilies
 %%DATADIR%%/levels/SnyMaxx
+%%DATADIR%%/levels/Symmetry
 %%DATADIR%%/levels/Symmetry-MKII
+%%DATADIR%%/levels/T.C.S.
 %%DATADIR%%/levels/TheGauntlet
 %%DATADIR%%/levels/TimeWaster
 %%DATADIR%%/levels/Tricky
 %%DATADIR%%/levels/Twilight
 %%DATADIR%%/levels/WTF
 %%DATADIR%%/levels/Wolvie
+%%DATADIR%%/levels/WonderWalls
 %%DATADIR%%/levels/X
 %%DATADIR%%/levels/Yexter
 %%DATADIR%%/levels/Zigies
 %%DATADIR%%/levels/Zufallswelt
 %%DATADIR%%/levels/FatalDoomsday2
 %%DATADIR%%/levels/RichQuick
 %%DATADIR%%/levels/MontyHall
 %%DATADIR%%/levels/BigBang
 %%DATADIR%%/levels/P.I.T.A.
 %%DATADIR%%/levels/Alexandre
 %%DATADIR%%/levels/Bertrand
 %%DATADIR%%/levels/Celine
 %%DATADIR%%/levels/Classique
 %%DATADIR%%/levels/Invisible
 %%DATADIR%%/levels/Nations
 %%DATADIR%%/levels/ObiWan
 %%DATADIR%%/levels/StarWars
 %%DATADIR%%/levels/Vader
 %%DATADIR%%/levels/Yoda
 %%DATADIR%%/levels/Crossing
 %%DATADIR%%/levels/TrickShot
 %%DATADIR%%/levels/Weirdness
 %%DATADIR%%/levels/TheEnd
 %%DATADIR%%/levels/AllNighter
 %%DATADIR%%/levels/Patience
 %%DATADIR%%/levels/JediAdventure
 %%DATADIR%%/levels/KungFu
 %%DATADIR%%/levels/Zooligan
 %%DATADIR%%/sounds/attach.wav
 %%DATADIR%%/sounds/bonus_magnet.wav
 %%DATADIR%%/sounds/chaos.wav
 %%DATADIR%%/sounds/click.wav
 %%DATADIR%%/sounds/dammit.wav
 %%DATADIR%%/sounds/damn.wav
 %%DATADIR%%/sounds/darkness.wav
 %%DATADIR%%/sounds/disable.wav
 %%DATADIR%%/sounds/excellent.wav
 %%DATADIR%%/sounds/exp.wav
 %%DATADIR%%/sounds/expand.wav
 %%DATADIR%%/sounds/expl_ball.wav
 %%DATADIR%%/sounds/extraball.wav
 %%DATADIR%%/sounds/freeze.wav
 %%DATADIR%%/sounds/gainlife.wav
 %%DATADIR%%/sounds/ghost.wav
 %%DATADIR%%/sounds/goldshower.wav
 %%DATADIR%%/sounds/joker.wav
 %%DATADIR%%/sounds/looselife.wav
 %%DATADIR%%/sounds/malus_magnet.wav
 %%DATADIR%%/sounds/menu_click.wav
 %%DATADIR%%/sounds/menu_motion.wav
 %%DATADIR%%/sounds/metal.wav
 %%DATADIR%%/sounds/reflect_brick.wav
 %%DATADIR%%/sounds/reflect_paddle.wav
 %%DATADIR%%/sounds/score.wav
 %%DATADIR%%/sounds/shot.wav
 %%DATADIR%%/sounds/shrink.wav
 %%DATADIR%%/sounds/speeddown.wav
 %%DATADIR%%/sounds/speedup.wav
 %%DATADIR%%/sounds/standard.wav
 %%DATADIR%%/sounds/timeadd.wav
 %%DATADIR%%/sounds/verygood.wav
 %%DATADIR%%/sounds/wall.wav
 %%DATADIR%%/sounds/weak_ball.wav
 %%DATADIR%%/sounds/wontgiveup.wav
+share/applications/lbreakout2.desktop
+share/icons/lbreakout48.gif
+@dirrmtry share/applications
+@dirrmtry share/icons
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/levels
 @dirrm %%DATADIR%%/gui_theme
 @dirrm %%DATADIR%%/gfx/Oz
 @dirrm %%DATADIR%%/gfx/Moiree
 @dirrm %%DATADIR%%/gfx/Classic
 @dirrm %%DATADIR%%/gfx/AbsoluteB
 @dirrm %%DATADIR%%/gfx
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%