Index: gtk+-2.19.0/demos/Makefile.am
===================================================================
--- gtk+-2.19.0.orig/demos/Makefile.am
+++ gtk+-2.19.0/demos/Makefile.am
@@ -38,8 +38,8 @@ if CROSS_COMPILING
 pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
 pixbuf_csource_deps=
 else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders 
 endif
 
 test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
Index: gtk+-2.19.0/gdk-pixbuf/Makefile.am
===================================================================
--- gtk+-2.19.0.orig/gdk-pixbuf/Makefile.am
+++ gtk+-2.19.0/gdk-pixbuf/Makefile.am
@@ -612,7 +612,7 @@ MAINTAINERCLEANFILES = 		\
 	gdk-pixbuf-enum-types.c \
 	gdk-pixbuf-marshal.h 	\
 	gdk-pixbuf-marshal.c 	\
-	gdk-pixbuf.loaders
+	gdk-pixbuf64.loaders
 
 #
 # gdk-pixbuf-enum-types.h
@@ -701,10 +701,10 @@ endif
 install-data-hook: install-ms-lib install-def-file
 	@if $(RUN_QUERY_LOADER_TEST) ; then \
 	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf64.loaders ; \
 	else \
 	  echo "***" ; \
-	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \
+	  echo "*** Warning: gdk-pixbuf64.loaders not built" ; \
 	  echo "***" ; \
 	  echo "*** Generate this file manually on host" ; \
 	  echo "*** system using gdk-pixbuf-query-loaders" ; \
@@ -712,27 +712,27 @@ install-data-hook: install-ms-lib instal
 	fi
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
-	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf64.loaders
 
 if CROSS_COMPILING
 else
-all-local: gdk-pixbuf.loaders
+all-local: gdk-pixbuf64.loaders
 endif
 
 if BUILD_DYNAMIC_MODULES
-gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
+gdk-pixbuf64.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
 	LOADERS=`echo libpixbufloader-*.la` ; \
 	if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
           echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf64.loaders ;\
 	else \
           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
-	  touch gdk-pixbuf.loaders; \
+	  touch gdk-pixbuf64.loaders; \
 	fi
 else
-gdk-pixbuf.loaders: 
+gdk-pixbuf64.loaders: 
 	echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
-	touch gdk-pixbuf.loaders;
+	touch gdk-pixbuf64.loaders;
 endif
 
 -include $(top_srcdir)/git.mk
Index: gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+-2.19.0.orig/gdk-pixbuf/gdk-pixbuf-io.c
+++ gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
@@ -286,7 +286,7 @@ correct_prefix (gchar **path)
 
       /* This is an entry put there by gdk-pixbuf-query-loaders on the
        * packager's system. On Windows a prebuilt GTK+ package can be
-       * installed in a random location. The gdk-pixbuf.loaders file
+       * installed in a random location. The gdk-pixbuf64.loaders file
        * distributed in such a package contains paths from the package
        * builder's machine. Replace the build-time prefix with the
        * installation prefix on this machine.
@@ -305,7 +305,7 @@ gdk_pixbuf_get_module_file (void)
   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
 
   if (!result)
-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf64.loaders", NULL);
 
   return result;
 }
Index: gtk+-2.19.0/gtk/Makefile.am
===================================================================
--- gtk+-2.19.0.orig/gtk/Makefile.am
+++ gtk+-2.19.0/gtk/Makefile.am
@@ -949,7 +949,7 @@ distclean-local:
 
 DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
 
-TEST_DEPS = $(DEPS) gtk.immodules
+TEST_DEPS = $(DEPS) gtk64.immodules
 
 LDADDS =								\
 	$(gtktargetlib)							\
@@ -1311,7 +1311,7 @@ if CROSS_COMPILING
 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
 else
 gtk_update_icon_cache_program =							\
-	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders	\
+	GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders	\
 	   ./gtk-update-icon-cache
 endif
 
Index: gtk+-2.19.0/gtk/gtkmodules.c
===================================================================
--- gtk+-2.19.0.orig/gtk/gtkmodules.c
+++ gtk+-2.19.0/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.19.0/gtk/gtkrc.c
===================================================================
--- gtk+-2.19.0.orig/gtk/gtkrc.c
+++ gtk+-2.19.0/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.19.0/modules/input/Makefile.am
===================================================================
--- gtk+-2.19.0.orig/modules/input/Makefile.am
+++ gtk+-2.19.0/modules/input/Makefile.am
@@ -191,11 +191,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" ; \
@@ -203,7 +203,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
 
@@ -239,14 +239,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