diff --git a/Filelist b/Filelist
index b64658e..65ebe4c 100644
--- a/Filelist
+++ b/Filelist
@@ -531,6 +531,7 @@
 		runtime/pack/dist/opt/matchit/plugin/matchit.vim \
 		runtime/pack/dist/opt/matchit/doc/matchit.txt \
 		runtime/pack/dist/opt/matchit/doc/tags \
+		runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \
 
 # runtime files for all distributions without CR-NL translation
 RT_ALL_BIN =	\
diff --git a/runtime/macros/README.txt b/runtime/macros/README.txt
index a805007..a134112 100644
--- a/runtime/macros/README.txt
+++ b/runtime/macros/README.txt
@@ -15,9 +15,6 @@
 
 shellmenu.vim		menus for editing shell scripts in the GUI version
 
-swapmous.vim		swap left and right mouse buttons
-
-editexisting.vim	
 
 This one is only for Unix.
 file_select.vim		macros that make a handy file selector
@@ -34,3 +31,5 @@
 packadd! justify	justifying text.
 
 packadd! matchit	makes the % command work better
+
+packadd! swapmouse	swap left and right mouse buttons
diff --git a/runtime/macros/swapmous.vim b/runtime/macros/swapmous.vim
index 8b85be0..5884d83 100644
--- a/runtime/macros/swapmous.vim
+++ b/runtime/macros/swapmous.vim
@@ -1,22 +1,3 @@
-" These macros swap the left and right mouse buttons (for left handed)
-" Don't forget to do ":set mouse=a" or the mouse won't work at all
-noremap	 <LeftMouse>	<RightMouse>
-noremap	 <2-LeftMouse>	<2-RightMouse>
-noremap	 <3-LeftMouse>	<3-RightMouse>
-noremap	 <4-LeftMouse>	<4-RightMouse>
-noremap	 <LeftDrag>	<RightDrag>
-noremap	 <LeftRelease>	<RightRelease>
-noremap	 <RightMouse>	<LeftMouse>
-noremap	 <2-RightMouse>	<2-LeftMouse>
-noremap	 <3-RightMouse>	<3-LeftMouse>
-noremap	 <4-RightMouse>	<4-LeftMouse>
-noremap	 <RightDrag>	<LeftDrag>
-noremap	 <RightRelease>	<LeftRelease>
-noremap	 g<LeftMouse>	<C-RightMouse>
-noremap	 g<RightMouse>	<C-LeftMouse>
-noremap! <LeftMouse>	<RightMouse>
-noremap! <LeftDrag>	<RightDrag>
-noremap! <LeftRelease>	<RightRelease>
-noremap! <RightMouse>	<LeftMouse>
-noremap! <RightDrag>	<LeftDrag>
-noremap! <RightRelease>	<LeftRelease>
+" Load the swapmouse package.
+" For those users who were loading the swapmous plugin from here.
+packadd swapmouse
diff --git a/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim b/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
new file mode 100644
index 0000000..8b85be0
--- /dev/null
+++ b/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
@@ -0,0 +1,22 @@
+" These macros swap the left and right mouse buttons (for left handed)
+" Don't forget to do ":set mouse=a" or the mouse won't work at all
+noremap	 <LeftMouse>	<RightMouse>
+noremap	 <2-LeftMouse>	<2-RightMouse>
+noremap	 <3-LeftMouse>	<3-RightMouse>
+noremap	 <4-LeftMouse>	<4-RightMouse>
+noremap	 <LeftDrag>	<RightDrag>
+noremap	 <LeftRelease>	<RightRelease>
+noremap	 <RightMouse>	<LeftMouse>
+noremap	 <2-RightMouse>	<2-LeftMouse>
+noremap	 <3-RightMouse>	<3-LeftMouse>
+noremap	 <4-RightMouse>	<4-LeftMouse>
+noremap	 <RightDrag>	<LeftDrag>
+noremap	 <RightRelease>	<LeftRelease>
+noremap	 g<LeftMouse>	<C-RightMouse>
+noremap	 g<RightMouse>	<C-LeftMouse>
+noremap! <LeftMouse>	<RightMouse>
+noremap! <LeftDrag>	<RightDrag>
+noremap! <LeftRelease>	<RightRelease>
+noremap! <RightMouse>	<LeftMouse>
+noremap! <RightDrag>	<LeftDrag>
+noremap! <RightRelease>	<LeftRelease>
diff --git a/src/version.c b/src/version.c
index 6899189..70a5969 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1675,
+/**/
     1674,
 /**/
     1673,