diff --git a/games/stockfish/Makefile b/games/stockfish/Makefile
index ff5718fe8501..c463fb06f02a 100644
--- a/games/stockfish/Makefile
+++ b/games/stockfish/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	stockfish
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	games
-MASTER_SITES=	http://f.cl.ly/items/1W3R1i3c3Y2n0m133q15/:src \
+MASTER_SITES=	http://dl.dropbox.com/u/2116588/sf-archive/:src \
 		http://www.execve.net/sf/:src \
 		http://f.cl.ly/items/1y0Q3P2n0I2S0g0Y100E/:book \
 		http://www.execve.net/sf/:book
-DISTNAME=	sf-211-linux-eng
-DISTFILES=	sf-211-linux-eng.zip:src \
+DISTNAME=	stockfish-221-ja
+DISTFILES=	stockfish-221-ja.zip:src \
 		sf-211-book.zip:book
 
 MAINTAINER=	execve@gmail.com
@@ -27,6 +26,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	yes
 MYARCH=		${ARCH}
 BOOKDIR=	sf-211-book
+PORTDOCS=	Readme.txt polyglot.ini
+PORTDATA=	Book.bin
+
+PLIST_FILES=	bin/stockfish
+PLIST_DIRSTRY=	share/data/${PORTNAME} \
+		share/docs/${PORTNAME}
 
 ALL_TARGET=	build ARCH=${MYARCH}
 
@@ -63,10 +68,16 @@ BROKEN=		Does not compile on ia64, powerpc, or sparc64
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stockfish ${PREFIX}/bin/stockfish
+
+post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/Readme.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/polyglot.ini ${DOCSDIR}
+.endif
+.if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/${BOOKDIR}/Book.bin ${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/${BOOKDIR}/${PORTDATA} ${DATADIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/stockfish/distinfo b/games/stockfish/distinfo
index 54d7216ac351..f2fd2e4de9ba 100644
--- a/games/stockfish/distinfo
+++ b/games/stockfish/distinfo
@@ -1,4 +1,4 @@
-SHA256 (sf-211-linux-eng.zip) = 65398505d9582160a62520eb1bebe4527df7d90e3af2b88d0458919bf65c2def
-SIZE (sf-211-linux-eng.zip) = 1218458
+SHA256 (stockfish-221-ja.zip) = 071ea36f7d1fbc5c1b932ce89e4b342e9ec0a95d4d94d40e40803d35338850a0
+SIZE (stockfish-221-ja.zip) = 2150276
 SHA256 (sf-211-book.zip) = fc4b2964128278dcf076b1601a5fb7a6cc88d87d9f617d32fa82aeb05cfdff74
 SIZE (sf-211-book.zip) = 8831695
diff --git a/games/stockfish/pkg-plist b/games/stockfish/pkg-plist
deleted file mode 100644
index 2b5b0fdd070e..000000000000
--- a/games/stockfish/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/stockfish
-%%DATADIR%%/Book.bin
-%%DOCSDIR%%/Readme.txt
-%%DOCSDIR%%/polyglot.ini
-@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%