diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index 6a8b74695dcb..d5718594b88b 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -1,40 +1,36 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pushover
 PORTVERSION=	0.0.5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Pushover/${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A puzzle game where the goal is to push over all dominoes
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl mixer ttf
 USE_LUA=	5.1
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		gettext gmake pkgconfig
 
 PORTDOCS=	*
+PORTDATA=	*
 
 DESKTOP_ENTRIES="Pushover" \
 		"Push over all dominoes" \
 		"${DATADIR}/pushover.ico" \
 		"pushover" \
 		"Game;LogicGame;" \
 		false
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|lua5.1|lua-5.1|' ${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/install-data-am/ s|install-dist_docDATA||' \
-		${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/pushover/pkg-plist b/games/pushover/pkg-plist
index 8440111debab..c5a8619b4462 100644
--- a/games/pushover/pkg-plist
+++ b/games/pushover/pkg-plist
@@ -1,67 +1,9 @@
 bin/pushover
 share/locale/cs/LC_MESSAGES/pushover.mo
 share/locale/de/LC_MESSAGES/pushover.mo
 share/locale/eo/LC_MESSAGES/pushover.mo
 share/locale/es/LC_MESSAGES/pushover.mo
 share/locale/fr/LC_MESSAGES/pushover.mo
 share/locale/it/LC_MESSAGES/pushover.mo
 share/locale/ru/LC_MESSAGES/pushover.mo
 share/locale/sv/LC_MESSAGES/pushover.mo
-%%DATADIR%%/data/01_StandardFalling.ogg
-%%DATADIR%%/data/02_StopperHit.ogg
-%%DATADIR%%/data/03_Splitter.ogg
-%%DATADIR%%/data/04_Exploder.ogg
-%%DATADIR%%/data/05_Delay.ogg
-%%DATADIR%%/data/06_TumblerFalling.ogg
-%%DATADIR%%/data/07_BridgerFalling.ogg
-%%DATADIR%%/data/09_TriggerFalling.ogg
-%%DATADIR%%/data/0A_Ascender.ogg
-%%DATADIR%%/data/0B_Falling.ogg
-%%DATADIR%%/data/0C_Landing.ogg
-%%DATADIR%%/data/0D_PickUpDomino.ogg
-%%DATADIR%%/data/0E_Tapping.ogg
-%%DATADIR%%/data/0F_Schrugging.ogg
-%%DATADIR%%/data/10_DoorClose.ogg
-%%DATADIR%%/data/11_DoorOpen.ogg
-%%DATADIR%%/data/13_Victory.ogg
-%%DATADIR%%/data/FreeSans.ttf
-%%DATADIR%%/data/ant.png
-%%DATADIR%%/data/box.png
-%%DATADIR%%/data/carried.png
-%%DATADIR%%/data/dominos.png
-%%DATADIR%%/levels/av.gz
-%%DATADIR%%/levels/original.gz
-%%DATADIR%%/pushover.ico
-%%DATADIR%%/themes/aztec.lua
-%%DATADIR%%/themes/aztec.ogg
-%%DATADIR%%/themes/aztec.png
-%%DATADIR%%/themes/castle.lua
-%%DATADIR%%/themes/castle.ogg
-%%DATADIR%%/themes/castle.png
-%%DATADIR%%/themes/cavern.lua
-%%DATADIR%%/themes/cavern.png
-%%DATADIR%%/themes/dungeon.lua
-%%DATADIR%%/themes/dungeon.ogg
-%%DATADIR%%/themes/dungeon.png
-%%DATADIR%%/themes/electro.lua
-%%DATADIR%%/themes/electro.png
-%%DATADIR%%/themes/greek.lua
-%%DATADIR%%/themes/greek.ogg
-%%DATADIR%%/themes/greek.png
-%%DATADIR%%/themes/japanese.lua
-%%DATADIR%%/themes/japanese.ogg
-%%DATADIR%%/themes/japanese.png
-%%DATADIR%%/themes/mechanic.lua
-%%DATADIR%%/themes/mechanic.ogg
-%%DATADIR%%/themes/mechanic.png
-%%DATADIR%%/themes/space.lua
-%%DATADIR%%/themes/space.ogg
-%%DATADIR%%/themes/space.png
-%%DATADIR%%/themes/tools.lua
-%%DATADIR%%/themes/toxcity.lua
-%%DATADIR%%/themes/toxcity.ogg
-%%DATADIR%%/themes/toxcity.png
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%