diff --git a/base/internals/Makefile b/base/internals/Makefile
index 471fc383..d24adfa3 100644
--- a/base/internals/Makefile
+++ b/base/internals/Makefile
@@ -5,8 +5,7 @@ FOBJS = psi_compute_size.o psi_crea_bnd_elem.o psi_crea_index.o \
 	psi_bld_tmphalo.o psi_sort_dl.o \
         psi_desc_impl.o psi_list_search.o psi_srtlist.o 
 
-MPFOBJS = psi_desc_index.o psi_extrct_dl.o \
-	psi_fnd_owner.o psb_indx_map_fnd_owner.o
+MPFOBJS = psi_desc_index.o psi_extrct_dl.o psi_fnd_owner.o
 
 LIBDIR=..
 INCDIR=..
diff --git a/base/modules/Makefile b/base/modules/Makefile
index b6ab52ea..99e02ae2 100644
--- a/base/modules/Makefile
+++ b/base/modules/Makefile
@@ -26,7 +26,7 @@ COMMINT=penv/psi_comm_buffers_mod.o penv/psi_penv_mod.o \
 UTIL_MODS = auxil/psb_string_mod.o desc/psb_desc_const_mod.o desc/psb_indx_map_mod.o\
         desc/psb_gen_block_map_mod.o desc/psb_list_map_mod.o desc/psb_repl_map_mod.o\
         desc/psb_glist_map_mod.o desc/psb_hash_map_mod.o desc/psb_hashval.o \
-	desc/psb_desc_mod.o auxil/psb_sort_mod.o \
+	desc/psb_desc_mod.o desc/psb_indx_map_fnd_owner.o auxil/psb_sort_mod.o \
 	serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o \
 	serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o \
 	serial/psb_serial_mod.o \
@@ -246,6 +246,8 @@ desc/psb_desc_mod.o: psb_penv_mod.o psb_realloc_mod.o\
 	  desc/psb_repl_map_mod.o desc/psb_gen_block_map_mod.o desc/psb_desc_const_mod.o\
 	  desc/psb_indx_map_mod.o serial/psb_i_vect_mod.o
 
+desc/psb_indx_map_fnd_owner.o: desc/psb_desc_mod.o serial/psb_serial_mod.o
+
 psi_i_mod.o: desc/psb_desc_mod.o serial/psb_i_vect_mod.o comm/psi_e_comm_a_mod.o \
 	comm/psi_m_comm_a_mod.o comm/psi_i_comm_v_mod.o
 psi_l_mod.o: desc/psb_desc_mod.o serial/psb_l_vect_mod.o comm/psi_e_comm_a_mod.o \
diff --git a/base/internals/psb_indx_map_fnd_owner.F90 b/base/modules/desc/psb_indx_map_fnd_owner.F90
similarity index 100%
rename from base/internals/psb_indx_map_fnd_owner.F90
rename to base/modules/desc/psb_indx_map_fnd_owner.F90