diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index 23d2dcef432c..96cfd72e8613 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -1,22 +1,24 @@
-PORTNAME=		sokoban
-PORTVERSION=		1.0
-PORTREVISION=		2
-CATEGORIES=		games
-MASTER_SITES=		SUNSITE/games/strategy
-DISTNAME=		${PORTNAME}-src
+PORTNAME=	sokoban
+DISTVERSION=	1.0
+PORTREVISION=	3
+CATEGORIES=	games
+MASTER_SITES=	SUNSITE/games/strategy:src \
+		http://www.cs.cornell.edu/andru/release/:x
+DISTFILES=	${PORTNAME}-src.tar.gz:src xsokoban-3.3c.tar.gz:x
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Logical game: problems with packets in cave
+MAINTAINER=	mew14930xvi@inbox.lv
+COMMENT=	Logical game: problems with packets in cave
 
-USES=			ncurses
-WRKSRC=			${WRKDIR}/sokoban
+USES=		ncurses
 ALL_TARGET=
+WRKSRC=		${WRKDIR}/sokoban
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sokoban ${STAGEDIR}${PREFIX}/bin/sokoban
 	@${MKDIR} ${STAGEDIR}${DATADIR}/screens
-	${INSTALL_DATA} ${WRKSRC}/screens/* ${STAGEDIR}${DATADIR}/screens
+	${INSTALL_DATA} ${WRKSRC}/screens/sokoban.help \
+		${WRKDIR}/xsokoban/screens/* ${STAGEDIR}${DATADIR}/screens
 	@${MKDIR} ${STAGEDIR}/var/games/sokoban
 	truncate -s 512 ${STAGEDIR}/var/games/sokoban/scores.sample
 
 .include <bsd.port.mk>
diff --git a/games/sokoban/distinfo b/games/sokoban/distinfo
index 6173ee5b3133..14d2147cab70 100644
--- a/games/sokoban/distinfo
+++ b/games/sokoban/distinfo
@@ -1,2 +1,5 @@
+TIMESTAMP = 1731471504
 SHA256 (sokoban-src.tar.gz) = f75d4e89b11cb4d5e944b902e2f333111c7027435670af9ee5d0a889a8c665f3
 SIZE (sokoban-src.tar.gz) = 16287
+SHA256 (xsokoban-3.3c.tar.gz) = 292fa7968e75ebe40bc71470f7dbaccb053a9f6b34a9d0038a372d213cbad400
+SIZE (xsokoban-3.3c.tar.gz) = 98961
diff --git a/games/sokoban/files/patch-sokoban.h b/games/sokoban/files/patch-sokoban.h
index a5e9e1a15dba..e6e0c19c327f 100644
--- a/games/sokoban/files/patch-sokoban.h
+++ b/games/sokoban/files/patch-sokoban.h
@@ -1,26 +1,35 @@
 --- sokoban.h.orig	1992-05-15 05:15:26 UTC
 +++ sokoban.h
 @@ -1,6 +1,14 @@
  /***********************************************************************
     You may wish to alter the following directory paths
  ***********************************************************************/
 +
 +#ifdef PREFIX
 +#define SCREENPATH	PREFIX	"/share/sokoban/screens"
 +#define SAVEPATH		"/var/games/sokoban"
 +#define LOCKFILE		"/tmp/sok.tmp"
 +#define SCOREFILE		"/var/games/sokoban/scores"
 +#else
 +
  /**/
  /* SCREENPATH: the name of the directioy where the screen file are held */
  /**/
 @@ -24,6 +32,8 @@
  /**/
  #define SCOREFILE	"/usr/games/sokob/highscore"
  
 +#endif
 +
  /**/
  /* MAXUSERNAME: defines the maximum length of a system's user name */
  /**/
+@@ -32,7 +42,7 @@
+ /**/
+ /* MAXSCOREENTRIES: defines the maximum numner of entries in the scoretable */
+ /**/
+-#define MAXSCOREENTRIES	50
++#define MAXSCOREENTRIES	90
+
+ /**/
+ /* SUPERUSER: defines the name of the game superuser */
diff --git a/games/sokoban/pkg-descr b/games/sokoban/pkg-descr
index e8ac4d15f197..3e891b89070c 100644
--- a/games/sokoban/pkg-descr
+++ b/games/sokoban/pkg-descr
@@ -1,4 +1,5 @@
 This is port of SOKOBAN - logical game, where U must solve problems
 with pushing packets in labirints.
 The problem is to push packets to saving positions by moving around
 and pushing only one packet at a time if possible.
+This port installs the screens added by xsokoban.
diff --git a/games/sokoban/pkg-plist b/games/sokoban/pkg-plist
index a6ddd19a3fea..523b877ab157 100644
--- a/games/sokoban/pkg-plist
+++ b/games/sokoban/pkg-plist
@@ -1,54 +1,94 @@
 @(root,games,2555) bin/sokoban
 @dir(root,games,0775) /var/games/sokoban
 @sample(root,games,0664) /var/games/sokoban/scores.sample
 %%DATADIR%%/screens/sokoban.help
 %%DATADIR%%/screens/screen.1
 %%DATADIR%%/screens/screen.2
 %%DATADIR%%/screens/screen.3
 %%DATADIR%%/screens/screen.4
 %%DATADIR%%/screens/screen.5
 %%DATADIR%%/screens/screen.6
 %%DATADIR%%/screens/screen.7
 %%DATADIR%%/screens/screen.8
 %%DATADIR%%/screens/screen.9
 %%DATADIR%%/screens/screen.10
 %%DATADIR%%/screens/screen.11
 %%DATADIR%%/screens/screen.12
 %%DATADIR%%/screens/screen.13
 %%DATADIR%%/screens/screen.14
 %%DATADIR%%/screens/screen.15
 %%DATADIR%%/screens/screen.16
 %%DATADIR%%/screens/screen.17
 %%DATADIR%%/screens/screen.18
 %%DATADIR%%/screens/screen.19
 %%DATADIR%%/screens/screen.20
 %%DATADIR%%/screens/screen.21
 %%DATADIR%%/screens/screen.22
 %%DATADIR%%/screens/screen.23
 %%DATADIR%%/screens/screen.24
 %%DATADIR%%/screens/screen.25
 %%DATADIR%%/screens/screen.26
 %%DATADIR%%/screens/screen.27
 %%DATADIR%%/screens/screen.28
 %%DATADIR%%/screens/screen.29
 %%DATADIR%%/screens/screen.30
 %%DATADIR%%/screens/screen.31
 %%DATADIR%%/screens/screen.32
 %%DATADIR%%/screens/screen.33
 %%DATADIR%%/screens/screen.34
 %%DATADIR%%/screens/screen.35
 %%DATADIR%%/screens/screen.36
 %%DATADIR%%/screens/screen.37
 %%DATADIR%%/screens/screen.38
 %%DATADIR%%/screens/screen.39
 %%DATADIR%%/screens/screen.40
 %%DATADIR%%/screens/screen.41
 %%DATADIR%%/screens/screen.42
 %%DATADIR%%/screens/screen.43
 %%DATADIR%%/screens/screen.44
 %%DATADIR%%/screens/screen.45
 %%DATADIR%%/screens/screen.46
 %%DATADIR%%/screens/screen.47
 %%DATADIR%%/screens/screen.48
 %%DATADIR%%/screens/screen.49
 %%DATADIR%%/screens/screen.50
+%%DATADIR%%/screens/screen.51
+%%DATADIR%%/screens/screen.52
+%%DATADIR%%/screens/screen.53
+%%DATADIR%%/screens/screen.54
+%%DATADIR%%/screens/screen.55
+%%DATADIR%%/screens/screen.56
+%%DATADIR%%/screens/screen.57
+%%DATADIR%%/screens/screen.58
+%%DATADIR%%/screens/screen.59
+%%DATADIR%%/screens/screen.60
+%%DATADIR%%/screens/screen.61
+%%DATADIR%%/screens/screen.62
+%%DATADIR%%/screens/screen.63
+%%DATADIR%%/screens/screen.64
+%%DATADIR%%/screens/screen.65
+%%DATADIR%%/screens/screen.66
+%%DATADIR%%/screens/screen.67
+%%DATADIR%%/screens/screen.68
+%%DATADIR%%/screens/screen.69
+%%DATADIR%%/screens/screen.70
+%%DATADIR%%/screens/screen.71
+%%DATADIR%%/screens/screen.72
+%%DATADIR%%/screens/screen.73
+%%DATADIR%%/screens/screen.74
+%%DATADIR%%/screens/screen.75
+%%DATADIR%%/screens/screen.76
+%%DATADIR%%/screens/screen.77
+%%DATADIR%%/screens/screen.78
+%%DATADIR%%/screens/screen.79
+%%DATADIR%%/screens/screen.80
+%%DATADIR%%/screens/screen.81
+%%DATADIR%%/screens/screen.82
+%%DATADIR%%/screens/screen.83
+%%DATADIR%%/screens/screen.84
+%%DATADIR%%/screens/screen.85
+%%DATADIR%%/screens/screen.86
+%%DATADIR%%/screens/screen.87
+%%DATADIR%%/screens/screen.88
+%%DATADIR%%/screens/screen.89
+%%DATADIR%%/screens/screen.90