diff --git a/app-editors/vim/patches/vim-9.1.1147.patchset b/app-editors/vim/patches/vim-9.1.1147.patchset
new file mode 100644
index 000000000..7cbea7110
--- /dev/null
+++ b/app-editors/vim/patches/vim-9.1.1147.patchset
@@ -0,0 +1,39 @@
+From cbef9564cc53f83ea4fb2a381a81d11df771b502 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Tue, 25 Feb 2025 07:14:48 +0100
+Subject: Fixes for new variable XDG_RUNTIMEPATH
+
+
+diff --git a/src/os_haiku.h b/src/os_haiku.h
+index 1977cc1..2e26485 100644
+--- a/src/os_haiku.h
++++ b/src/os_haiku.h
+@@ -25,13 +25,19 @@
+ 
+ #ifdef RUNTIME_GLOBAL
+ # ifdef RUNTIME_GLOBAL_AFTER
+-#  define DFLT_RUNTIMEPATH	USR_VIM_DIR "," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "," USR_VIM_DIR "/after"
+-#  define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
++#    define DFLT_RUNTIMEPATH	USR_VIM_DIR "," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "," USR_VIM_DIR "/after"
++#    define XDG_RUNTIMEPATH	"$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,$XDG_CONFIG_HOME/vim/after"
++#    define XDG_RUNTIMEPATH_FB	"~/config/settings/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,~/config/settings/vim/after"
++#    define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
+ # else
+-#  define DFLT_RUNTIMEPATH	USR_VIM_DIR "," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after," USR_VIM_DIR "/after"
+-#  define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
++#    define DFLT_RUNTIMEPATH	USR_VIM_DIR "," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after," USR_VIM_DIR "/after"
++#    define XDG_RUNTIMEPATH	"$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,$XDG_CONFIG_HOME/vim/after"
++#    define XDG_RUNTIMEPATH_FB	"~/config/settings/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after,~/config/settings/vim/after"
++#    define CLEAN_RUNTIMEPATH	RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL "/after"
+ # endif
+ #else
+-# define DFLT_RUNTIMEPATH	USR_VIM_DIR ",$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after," USR_VIM_DIR "/after"
+-# define CLEAN_RUNTIMEPATH	"$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
++#   define DFLT_RUNTIMEPATH	USR_VIM_DIR ",$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after," USR_VIM_DIR "/after"
++#   define XDG_RUNTIMEPATH	"$XDG_CONFIG_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$XDG_CONFIG_HOME/vim/after"
++#   define XDG_RUNTIMEPATH_FB	"~/config/settings/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/config/settings/vim/after"
++#   define CLEAN_RUNTIMEPATH	"$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
+ #endif
+-- 
+2.45.2
+
diff --git a/app-editors/vim/vim-9.1.0.recipe b/app-editors/vim/vim-9.1.1147.recipe
similarity index 93%
rename from app-editors/vim/vim-9.1.0.recipe
rename to app-editors/vim/vim-9.1.1147.recipe
index 8c50e1b11..fd9140f0d 100644
--- a/app-editors/vim/vim-9.1.0.recipe
+++ b/app-editors/vim/vim-9.1.1147.recipe
@@ -10,12 +10,13 @@ configuration files.
 Despite this, Vim can be configured to work in a very simple (Notepad-like) \
 way, called evim or Easy Vim."
 HOMEPAGE="https://www.vim.org/"
-COPYRIGHT="1991-2023 Bram Moleenar et al."
+COPYRIGHT="1991-2025 Bram Moleenar et al."
 LICENSE="Vim"
 REVISION="1"
 SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="ddb435f6e386c53799a3025bdc5a3533beac735a0ee596cb27ada97366a1c725"
+CHECKSUM_SHA256="b27ae9a649b5b75608e0de7673a0a5db673532936a2e0126436a5b893922ed44"
 SOURCE_FILENAME="vim-$portVersion.tar.gz"
+PATCHES="vim-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -92,13 +93,13 @@ BUILD()
 
 	export CFLAGS="\
 		`pkg-config --cflags python3` \
-		-fPIC"
+		-fPIC -O2"
 	export LDFLAGS="-lgnu"
 
 # CLI -------------------------------------------
 
 	# Clean objects from possible previous run to avoid mixup of GUI/CLI objects
-	rm objects/*.o || true
+	rm -rf objects/*.o || true
 
 	runConfigure --omit-dirs binDir ./configure \
 		--bindir="$commandBinDir" \
@@ -138,6 +139,10 @@ INSTALL()
 {
 	make install
 	ln -s vim $commandBinDir/vi
+
+	# cleanup
+	rm -rf $dataDir/{applications,icons}
+
 	addAppDeskbarSymlink $commandBinDir/gvim Vim
 }