diff --git a/cmake/Modules/Packages/MC.cmake b/cmake/Modules/Packages/MC.cmake
index f162254558..2a72a895cf 100644
--- a/cmake/Modules/Packages/MC.cmake
+++ b/cmake/Modules/Packages/MC.cmake
@@ -7,3 +7,13 @@ if(NOT PKG_MANYBODY)
   list(REMOVE_ITEM LAMMPS_SOURCES ${LAMMPS_SOURCE_DIR}/MC/fix_sgcmc.cpp)
   set_property(TARGET lammps PROPERTY SOURCES "${LAMMPS_SOURCES}")
 endif()
+
+# fix neighbor/swap may only be installed if also the VORONOI package is installed
+if(NOT PKG_VORONOI)
+  get_property(LAMMPS_FIX_HEADERS GLOBAL PROPERTY FIX)
+  list(REMOVE_ITEM LAMMPS_FIX_HEADERS ${LAMMPS_SOURCE_DIR}/MC/fix_neighbor_swap.h)
+  set_property(GLOBAL PROPERTY FIX "${LAMMPS_FIX_HEADERS}")
+  get_target_property(LAMMPS_SOURCES lammps SOURCES)
+  list(REMOVE_ITEM LAMMPS_SOURCES ${LAMMPS_SOURCE_DIR}/MC/fix_neighbor_swap.cpp)
+  set_property(TARGET lammps PROPERTY SOURCES "${LAMMPS_SOURCES}")
+endif()
diff --git a/src/.gitignore b/src/.gitignore
index f0554e3bfe..0f0e3759c9 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -912,6 +912,8 @@
 /fix_msst.h
 /fix_neb.cpp
 /fix_neb.h
+/fix_neighbor_swap.cpp
+/fix_neighbor_swap.h
 /fix_nh_asphere.cpp
 /fix_nh_asphere.h
 /fix_nph_asphere.cpp
diff --git a/src/MC/Install.sh b/src/MC/Install.sh
index 9a0095fd34..efe6b7c07b 100755
--- a/src/MC/Install.sh
+++ b/src/MC/Install.sh
@@ -51,8 +51,8 @@ action fix_charge_regulation.cpp
 action fix_charge_regulation.h
 action fix_gcmc.cpp
 action fix_gcmc.h
-action fix_neighbor_swap.cpp
-action fix_neighbor_swap.h
+action fix_neighbor_swap.cpp  compute_voronoi_atom.cpp
+action fix_neighbor_swap.h    compute_voronoi_atom.h
 action fix_mol_swap.cpp
 action fix_mol_swap.h
 action fix_sgcmc.cpp   pair_eam.cpp