diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 367e57c91dcc..57f88bf192d2 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	scmxx
-PORTVERSION=	0.6.3.8
+PORTVERSION=	0.6.4
 CATEGORIES=	comms
-MASTER_SITES=	http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/ \
-		http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/old/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	scmxx
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Data exchange utility for Siemens mobile phones
@@ -25,6 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 USE_GMAKE=	yes
 
 MAN1=		scmxx.1
+MANLANG=	"" ru
 
 .ifndef(NOPORTDOCS)
 post-install:
@@ -32,7 +33,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in phonebook sms.txt vCalendar.vcs vCard.vcf
+.for file in sms.txt vCalendar.vcs vCard.vcf
 	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR}
 .endfor
 .endif
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index 9b4355e0a2f7..0dc43e0772f8 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1 +1 @@
-MD5 (scmxx-0.6.3.8.tar.bz2) = cf3f60b9da24b81334fa23679261d456
+MD5 (scmxx-0.6.4.tar.bz2) = 8e01d01b0adab0823a096d44c8b089a5
diff --git a/comms/scmxx/pkg-plist b/comms/scmxx/pkg-plist
index 859f357b906d..32fa09fc9b98 100644
--- a/comms/scmxx/pkg-plist
+++ b/comms/scmxx/pkg-plist
@@ -1,12 +1,11 @@
 @comment $FreeBSD$
 bin/scmxx
-%%PORTDOCS%%share/doc/scmxx/README
-%%PORTDOCS%%share/doc/scmxx/gsmcharset.txt
-%%PORTDOCS%%share/doc/scmxx/gsm0338.txt
-%%PORTDOCS%%share/doc/scmxx/doc_sources.txt
-%%PORTDOCS%%share/examples/scmxx/phonebook
-%%PORTDOCS%%share/examples/scmxx/sms.txt
-%%PORTDOCS%%share/examples/scmxx/vCalendar.vcs
-%%PORTDOCS%%share/examples/scmxx/vCard.vcf
-%%PORTDOCS%%@dirrm share/doc/scmxx
-%%PORTDOCS%%@dirrm share/examples/scmxx
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/gsmcharset.txt
+%%PORTDOCS%%%%DOCSDIR%%/gsm0338.txt
+%%PORTDOCS%%%%DOCSDIR%%/doc_sources.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/sms.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/vCalendar.vcs
+%%PORTDOCS%%%%EXAMPLESDIR%%/vCard.vcf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%