Index: gtk+-2.21.4/gtk/Makefile.am
===================================================================
--- gtk+-2.21.4.orig/gtk/Makefile.am
+++ gtk+-2.21.4/gtk/Makefile.am
@@ -974,7 +974,7 @@ distclean-local:
 
 DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
 
-TEST_DEPS = $(DEPS) gtk.immodules
+TEST_DEPS = $(DEPS) gtk64.immodules
 
 LDADDS =								\
 	$(gtktargetlib)							\
Index: gtk+-2.21.4/gtk/gtkmodules.c
===================================================================
--- gtk+-2.21.4.orig/gtk/gtkmodules.c
+++ gtk+-2.21.4/gtk/gtkmodules.c
@@ -68,7 +68,7 @@ get_module_path (void)
   if (home_dir)
     home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
 
-  module_path_env = g_getenv ("GTK_PATH");
+  module_path_env = g_getenv ("GTK_PATH64");
   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
 
   if (exe_prefix)
Index: gtk+-2.21.4/gtk/gtkrc.c
===================================================================
--- gtk+-2.21.4.orig/gtk/gtkrc.c
+++ gtk+-2.21.4/gtk/gtkrc.c
@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
       if (im_module_file)
 	result = g_strdup (im_module_file);
       else
-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk64.immodules", NULL);
     }
 
   return result;
Index: gtk+-2.21.4/modules/input/Makefile.am
===================================================================
--- gtk+-2.21.4.orig/modules/input/Makefile.am
+++ gtk+-2.21.4/modules/input/Makefile.am
@@ -189,11 +189,11 @@ install-data-hook:
 	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
 	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
 	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
-	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules" ; \
+	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules ; \
 	else \
 	  echo "***" ; \
-	  echo "*** Warning: gtk.immodules not built" ; \
+	  echo "*** Warning: gtk64.immodules not built" ; \
 	  echo "***" ; \
 	  echo "*** Generate this file manually on host" ; \
 	  echo "*** system using gtk-query-immodules-2.0" ; \
@@ -201,7 +201,7 @@ install-data-hook:
         fi
 
 uninstall-local:
-	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules
 
 if BUILD_DYNAMIC_MODULES
 
@@ -237,14 +237,14 @@ noinst_LTLIBRARIES =				\
 
 included-modules: $(noinst_LTLIBRARIES)
 
-gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+gtk64.immodules: Makefile.am $(module_LTLIBRARIES)
+	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk64.immodules
 
-CLEANFILES = gtk.immodules
+CLEANFILES = gtk64.immodules
 
 if CROSS_COMPILING
 else
-all-local: gtk.immodules
+all-local: gtk64.immodules
 endif
 
 -include $(top_srcdir)/git.mk