diff --git a/www/xpi-vimperator/Makefile b/www/xpi-vimperator/Makefile
index 38fd31abe2a4..c18a75e076e2 100644
--- a/www/xpi-vimperator/Makefile
+++ b/www/xpi-vimperator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vimperator
-PORTVERSION=	3.4
+PORTVERSION=	3.5
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
diff --git a/www/xpi-vimperator/distinfo b/www/xpi-vimperator/distinfo
index 54ecf46f2785..70edef16d1ae 100644
--- a/www/xpi-vimperator/distinfo
+++ b/www/xpi-vimperator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/vimperator-3.4-fx.xpi) = 61c7e1f0d69d9a18cffaf33a2309b6dec4401cc4a09a53142e5903dc2bc745ca
-SIZE (xpi/vimperator-3.4-fx.xpi) = 621510
+SHA256 (xpi/vimperator-3.5-fx.xpi) = 16f623ceb71e8a490ead83501e42d55a079568a24ddff00e5c90abef698317f6
+SIZE (xpi/vimperator-3.5-fx.xpi) = 583838
diff --git a/www/xpi-vimperator/pkg-descr b/www/xpi-vimperator/pkg-descr
index df5df6b019a6..0f1be5309385 100644
--- a/www/xpi-vimperator/pkg-descr
+++ b/www/xpi-vimperator/pkg-descr
@@ -1,6 +1,5 @@
 Vimperator is a free browser add-on for Firefox, which makes it look and behave
-like the Vim text editor. It has similar key bindings, and you could call it
-a modal webbrowser, as key bindings differ according to which mode you are in.
+like the Vim text editor. It has similar key bindings, and you could call it a
+modal webbrowser, as key bindings differ according to which mode you are in.
 
-Author:	Martin Stubenschrott <stubenschrott@gmx.net>
-WWW:	http://vimperator.org/vimperator
+WWW: http://vimperator.org/vimperator
diff --git a/www/xpi-vimperator/pkg-plist b/www/xpi-vimperator/pkg-plist
index a6b3c04eac6a..0a53cf8956d9 100644
--- a/www/xpi-vimperator/pkg-plist
+++ b/www/xpi-vimperator/pkg-plist
@@ -12,10 +12,8 @@
 %%XPI_XPIDIR%%/common/content/buffer.js
 %%XPI_XPIDIR%%/common/content/buffer.xhtml
 %%XPI_XPIDIR%%/common/content/commandline.js
-%%XPI_XPIDIR%%/common/content/commandline.js.orig
 %%XPI_XPIDIR%%/common/content/commands.js
 %%XPI_XPIDIR%%/common/content/completion.js
-%%XPI_XPIDIR%%/common/content/completion.js.rej
 %%XPI_XPIDIR%%/common/content/configbase.js
 %%XPI_XPIDIR%%/common/content/editor.js
 %%XPI_XPIDIR%%/common/content/eval.js
@@ -28,12 +26,11 @@
 %%XPI_XPIDIR%%/common/content/hints.js
 %%XPI_XPIDIR%%/common/content/history.js
 %%XPI_XPIDIR%%/common/content/io.js
+%%XPI_XPIDIR%%/common/content/io.js.rej
 %%XPI_XPIDIR%%/common/content/javascript.js
-%%XPI_XPIDIR%%/common/content/javascript.js.rej
 %%XPI_XPIDIR%%/common/content/liberator-overlay.js
 %%XPI_XPIDIR%%/common/content/liberator.js
 %%XPI_XPIDIR%%/common/content/liberator.xul
-%%XPI_XPIDIR%%/common/content/liberator.xul.orig
 %%XPI_XPIDIR%%/common/content/mappings.js
 %%XPI_XPIDIR%%/common/content/marks.js
 %%XPI_XPIDIR%%/common/content/modes.js
@@ -44,12 +41,10 @@
 %%XPI_XPIDIR%%/common/content/sanitizer.js
 %%XPI_XPIDIR%%/common/content/services.js
 %%XPI_XPIDIR%%/common/content/statusline.js
-%%XPI_XPIDIR%%/common/content/statusline.js.orig
 %%XPI_XPIDIR%%/common/content/style.js
 %%XPI_XPIDIR%%/common/content/tabs.js
 %%XPI_XPIDIR%%/common/content/template.js
 %%XPI_XPIDIR%%/common/content/util.js
-%%XPI_XPIDIR%%/common/content/util.js.orig
 %%XPI_XPIDIR%%/common/content/x-click-but21.png
 %%XPI_XPIDIR%%/common/locale/en-US/all.xml
 %%XPI_XPIDIR%%/common/locale/en-US/autocommands.xml
@@ -74,7 +69,6 @@
 %%XPI_XPIDIR%%/common/locale/en-US/various.xml
 %%XPI_XPIDIR%%/common/modules/storage.jsm
 %%XPI_XPIDIR%%/common/skin/liberator.css
-%%XPI_XPIDIR%%/common/skin/liberator.css.orig
 %%XPI_XPIDIR%%/common/skin/prompt (purple).png
 %%XPI_XPIDIR%%/common/skin/prompt.png
 %%XPI_XPIDIR%%/common/skin/prompt2.png
@@ -84,23 +78,21 @@
 %%XPI_XPIDIR%%/content/about.html
 %%XPI_XPIDIR%%/content/about_background.png
 %%XPI_XPIDIR%%/content/config.js
-%%XPI_XPIDIR%%/content/config.js.orig
-%%XPI_XPIDIR%%/content/config.js.rej
+%%XPI_XPIDIR%%/content/ignorekeys.js
 %%XPI_XPIDIR%%/content/liberator.dtd
 %%XPI_XPIDIR%%/content/logo.png
 %%XPI_XPIDIR%%/content/tabgroup.js
-%%XPI_XPIDIR%%/content/tabgroup.js.rej
 %%XPI_XPIDIR%%/content/vimperator.svg
 %%XPI_XPIDIR%%/content/vimperator.xul
 %%XPI_XPIDIR%%/install.rdf
 %%XPI_XPIDIR%%/locale/en-US/all.xml
 %%XPI_XPIDIR%%/locale/en-US/autocommands.xml
+%%XPI_XPIDIR%%/locale/en-US/browsing.xml
 %%XPI_XPIDIR%%/locale/en-US/gui.xml
 %%XPI_XPIDIR%%/locale/en-US/intro.xml
 %%XPI_XPIDIR%%/locale/en-US/liberator.dtd
 %%XPI_XPIDIR%%/locale/en-US/options.xml
 %%XPI_XPIDIR%%/locale/en-US/tabs.xml
-%%XPI_XPIDIR%%/locale/en-US/tabs.xml.rej
 %%XPI_XPIDIR%%/locale/en-US/tutorial.xml
 %%XPI_XPIDIR%%/skin/about.css
 %%XPI_XPIDIR%%/skin/icon.png