diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index cf225a952e3a..3f213c65adfe 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=		kbear
-PORTVERSION=		2.0
-PORTREVISION=		1
+PORTVERSION=		2.1
 CATEGORIES=		ftp kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}-${PORTVERSION}.src
+DISTNAME=		${PORTNAME}-${PORTVERSION}-1.src
 
 MAINTAINER=		arved@FreeBSD.org
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/.src//}
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=		yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=		yes
@@ -25,7 +24,4 @@ CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		XML2POT=${TRUE} PO2XML=${TRUE}
 
-post-patch:
-	${REINPLACE_CMD} -e 's,305,306,' ${WRKSRC}/kbear/kbear.cpp \
-		${WRKSRC}/kbear/parts/filesyspart/kbeardirlister.cpp
 .include <bsd.port.mk>
diff --git a/ftp/kbear/distinfo b/ftp/kbear/distinfo
index e0199d0d2a46..5ab930fcdd8d 100644
--- a/ftp/kbear/distinfo
+++ b/ftp/kbear/distinfo
@@ -1 +1 @@
-MD5 (kbear-2.0.src.tar.bz2) = 3ca464fd35072f80858c3203b231f2f0
+MD5 (kbear-2.1-1.src.tar.bz2) = 4b603a843b42e233fdb89e035ebc9c7f
diff --git a/ftp/kbear/pkg-plist b/ftp/kbear/pkg-plist
index b53009fbf990..47f4e7f986fc 100644
--- a/ftp/kbear/pkg-plist
+++ b/ftp/kbear/pkg-plist
@@ -43,6 +43,7 @@ share/apps/kbear/kpartplugins/kbearsitemanagerui.rc
 share/apps/kbear/kpartplugins/kbeartoolsplugin.rc
 share/apps/kbear/sitemanager.xml
 share/apps/kbear/tips
+share/apps/kbeardirsynchpart/kbeardirsynchpartui.rc
 share/apps/kbearfilesyspart/kbearfilesyspart.rc
 share/doc/HTML/cs/kbear/index.cache.bz2
 share/doc/HTML/cs/kbear/index.docbook
@@ -50,6 +51,9 @@ share/doc/HTML/cs/kbear/common
 share/doc/HTML/en/kbear/index.cache.bz2
 share/doc/HTML/en/kbear/index.docbook
 share/doc/HTML/en/kbear/common
+share/doc/HTML/es/kbear/index.cache.bz2
+share/doc/HTML/es/kbear/index.docbook
+share/doc/HTML/es/kbear/common
 share/doc/HTML/fr/kbear/index.cache.bz2
 share/doc/HTML/fr/kbear/index.docbook
 share/doc/HTML/fr/kbear/common
@@ -68,12 +72,11 @@ share/locale/cs/LC_MESSAGES/kbear.mo
 share/locale/de/LC_MESSAGES/kbear.mo
 share/locale/es/LC_MESSAGES/kbear.mo
 share/locale/fr/LC_MESSAGES/kbear.mo
+share/locale/he/LC_MESSAGES/kbear.mo
+share/locale/id/LC_MESSAGES/kbear.mo
 share/locale/it/LC_MESSAGES/kbear.mo
-share/locale/ja/LC_MESSAGES/kbear.mo
 share/locale/nl/LC_MESSAGES/kbear.mo
-share/locale/pl/LC_MESSAGES/kbear.mo
 share/locale/pt/LC_MESSAGES/kbear.mo
-share/locale/pt_BR/LC_MESSAGES/kbear.mo
 share/locale/ro/LC_MESSAGES/kbear.mo
 share/locale/ru/LC_MESSAGES/kbear.mo
 share/locale/sv/LC_MESSAGES/kbear.mo
@@ -86,14 +89,11 @@ share/services/kbearwincommanderimportfilter.desktop
 share/services/kbearws_ftpimportfilter.desktop
 share/servicetypes/kbearimportfilter.desktop
 @dirrm share/doc/HTML/sv/kbear
-@dirrm share/doc/HTML/sv
 @dirrm share/doc/HTML/fr/kbear
-@dirrm share/doc/HTML/fr
 @dirrm share/doc/HTML/en/kbear
-@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML/es/kbear
 @dirrm share/doc/HTML/cs/kbear
-@dirrm share/doc/HTML/cs
-@dirrm share/doc/HTML
+@dirrm share/apps/kbeardirsynchpart
 @dirrm share/apps/kbearfilesyspart
 @dirrm share/apps/kbear/kpartplugins
 @dirrm share/apps/kbear/icons/hicolor/16x16/actions
@@ -101,5 +101,4 @@ share/servicetypes/kbearimportfilter.desktop
 @dirrm share/apps/kbear/icons/hicolor
 @dirrm share/apps/kbear/icons
 @dirrm share/apps/kbear
-@dirrm share/applnk/Internet
 @dirrm include/kbear