diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index 6eabc5d9ba28..fd5bf4f496ba 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -1,44 +1,30 @@
 PORTNAME=	lmarbles
-PORTVERSION=	1.0.8
-PORTREVISION=	6
+DISTVERSION=	1.1.1
 CATEGORIES=	games
-MASTER_SITES=	SF/lgames/${PORTNAME} \
-		SF/nemysisfreebsdp/${CATEGORIES}/:icons
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}_icons${EXTRACT_SUFX}:icons
+MASTER_SITES=	SF/lgames/${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Atomix-like game of moving marbles in puzzles
 WWW=		http://lgames.sourceforge.net/index.php?project=LMarbles
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake sdl
-USE_SDL=	sdl mixer
+USES=		gettext-runtime gmake localbase:ldflags sdl
+USE_SDL=	mixer sdl
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--localstatedir=/var/games/${PORTNAME}
+
+LDFLAGS+=	-lintl
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|; \
-		s|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|' \
+	@${REINPLACE_CMD} -e 's|(datadir)/icons/hicolor/256x256/apps|(datadir)/pixmaps|' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-m 666||; \
-		s|lmarbles.prfs|lmarbles.prfs.sample|' \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|icons/lmarbles48.gif|icons/lmarbles48.png|' \
-		${WRKSRC}/lmarbles.desktop.in
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog README README-SDL.txt" ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/src && ${COPYTREE_SHARE} "manual" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/lmarbles/distinfo b/games/lmarbles/distinfo
index 2c1a23ce0b1a..cf682da1d647 100644
--- a/games/lmarbles/distinfo
+++ b/games/lmarbles/distinfo
@@ -1,4 +1,5 @@
-SHA256 (lmarbles-1.0.8.tar.gz) = 0e5a16a0116d325589b28f3555ced6a0b486f0fd7632cd3d98bee5cddf213e83
-SIZE (lmarbles-1.0.8.tar.gz) = 914238
+TIMESTAMP = 1781424004
+SHA256 (lmarbles-1.1.1.tar.gz) = e82bae214b6426d21b89ca186171a4da26e2f7c468d5478a185135a0862cb1ab
+SIZE (lmarbles-1.1.1.tar.gz) = 1021606
 SHA256 (lmarbles_icons.tar.gz) = 7e33408a4b6a2e39c979654607757d53432f2d1eaa6814f4f2892939faa8a8cb
 SIZE (lmarbles_icons.tar.gz) = 4096
diff --git a/games/lmarbles/pkg-message b/games/lmarbles/pkg-message
new file mode 100644
index 000000000000..c99f6396fa9b
--- /dev/null
+++ b/games/lmarbles/pkg-message
@@ -0,0 +1,14 @@
+[
+{
+  type: upgrade
+  maximum_version: "1.0.8"
+  message: <<EOM
+games/lmarbles dropped global shared state support (/var/games/lmarbles/).
+
+Settings and high scores are now automatically managed per-user
+inside the home directory (~/.lmarbles/).
+
+You may safely delete the old shared directory and files.
+EOM
+}
+]
diff --git a/games/lmarbles/pkg-plist b/games/lmarbles/pkg-plist
index f0f662ab0a34..31ab71953989 100644
--- a/games/lmarbles/pkg-plist
+++ b/games/lmarbles/pkg-plist
@@ -1,73 +1,77 @@
-@(,games,2755) bin/lmarbles
-share/man/man6/lmarbles.6.gz
+bin/lmarbles
 share/applications/lmarbles.desktop
 %%DATADIR%%/gfx/board.bmp
 %%DATADIR%%/gfx/f_red.bmp
 %%DATADIR%%/gfx/f_small.bmp
 %%DATADIR%%/gfx/f_white.bmp
 %%DATADIR%%/gfx/f_yellow.bmp
 %%DATADIR%%/gfx/figure.bmp
 %%DATADIR%%/gfx/lights.bmp
 %%DATADIR%%/gfx/logo.bmp
 %%DATADIR%%/gfx/m_frame.bmp
 %%DATADIR%%/gfx/m_sframe.bmp
 %%DATADIR%%/gfx/marbles.bmp
 %%DATADIR%%/gfx/metal/arrow_d.bmp
 %%DATADIR%%/gfx/metal/arrow_l.bmp
 %%DATADIR%%/gfx/metal/arrow_r.bmp
 %%DATADIR%%/gfx/metal/arrow_u.bmp
 %%DATADIR%%/gfx/metal/background.bmp
 %%DATADIR%%/gfx/metal/barrier_lr.bmp
 %%DATADIR%%/gfx/metal/barrier_ud.bmp
 %%DATADIR%%/gfx/metal/floor.bmp
 %%DATADIR%%/gfx/metal/teleport0.bmp
 %%DATADIR%%/gfx/metal/teleport1.bmp
 %%DATADIR%%/gfx/metal/teleport2.bmp
 %%DATADIR%%/gfx/metal/teleport3.bmp
 %%DATADIR%%/gfx/metal/wall.bmp
 %%DATADIR%%/gfx/metal/wall_crumble.bmp
 %%DATADIR%%/gfx/stone/arrow_d.bmp
 %%DATADIR%%/gfx/stone/arrow_l.bmp
 %%DATADIR%%/gfx/stone/arrow_r.bmp
 %%DATADIR%%/gfx/stone/arrow_u.bmp
 %%DATADIR%%/gfx/stone/background.bmp
 %%DATADIR%%/gfx/stone/barrier_lr.bmp
 %%DATADIR%%/gfx/stone/barrier_ud.bmp
 %%DATADIR%%/gfx/stone/floor.bmp
 %%DATADIR%%/gfx/stone/teleport0.bmp
 %%DATADIR%%/gfx/stone/teleport1.bmp
 %%DATADIR%%/gfx/stone/teleport2.bmp
 %%DATADIR%%/gfx/stone/teleport3.bmp
 %%DATADIR%%/gfx/stone/wall.bmp
 %%DATADIR%%/gfx/stone/wall_crumble.bmp
 %%DATADIR%%/gfx/tiny.sdlfnt
 %%DATADIR%%/gfx/title.bmp
 %%DATADIR%%/gfx/win_icon.bmp
 %%DATADIR%%/gfx/wood/arrow_d.bmp
 %%DATADIR%%/gfx/wood/arrow_l.bmp
 %%DATADIR%%/gfx/wood/arrow_r.bmp
 %%DATADIR%%/gfx/wood/arrow_u.bmp
 %%DATADIR%%/gfx/wood/background.bmp
 %%DATADIR%%/gfx/wood/barrier_lr.bmp
 %%DATADIR%%/gfx/wood/barrier_ud.bmp
 %%DATADIR%%/gfx/wood/floor.bmp
 %%DATADIR%%/gfx/wood/teleport0.bmp
 %%DATADIR%%/gfx/wood/teleport1.bmp
 %%DATADIR%%/gfx/wood/teleport2.bmp
 %%DATADIR%%/gfx/wood/teleport3.bmp
 %%DATADIR%%/gfx/wood/wall.bmp
 %%DATADIR%%/gfx/wood/wall_crumble.bmp
 %%DATADIR%%/levels/Original
+%%DATADIR%%/manual/arrow.jpg
+%%DATADIR%%/manual/arrow2.jpg
+%%DATADIR%%/manual/crumble.jpg
+%%DATADIR%%/manual/manual.html
+%%DATADIR%%/manual/marbles.jpg
+%%DATADIR%%/manual/teleport.jpg
 %%DATADIR%%/sounds/alarm.wav
 %%DATADIR%%/sounds/arrow.wav
 %%DATADIR%%/sounds/click.wav
 %%DATADIR%%/sounds/explode.wav
 %%DATADIR%%/sounds/score.wav
 %%DATADIR%%/sounds/select.wav
 %%DATADIR%%/sounds/stop.wav
 %%DATADIR%%/sounds/teleport.wav
-share/pixmaps/lmarbles32.png
-share/pixmaps/lmarbles48.gif
-share/pixmaps/lmarbles48.png
-@sample(,games,664) /var/games/lmarbles/lmarbles.prfs.sample
-@dir /var/games/lmarbles
+share/locale/de/LC_MESSAGES/lmarbles.mo
+share/locale/fr/LC_MESSAGES/lmarbles.mo
+share/man/man6/lmarbles.6.gz
+share/pixmaps/lmarbles.png