--- a/components/sane-frontends/Makefile	Tue Jun 09 06:09:29 2015 -0700
+++ b/components/sane-frontends/Makefile	Tue Jun 09 19:08:23 2015 -0700
@@ -43,23 +43,23 @@
 CONFIGURE_OPTIONS +=	--disable-gtktest
 CONFIGURE_OPTIONS +=	--disable-gimptest
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
-CONFIGURE_OPTIONS +=	LDFLAGS="-lsane"
+CONFIGURE_OPTIONS +=	LDFLAGS="-lsane -m64"
+CONFIGURE_OPTIONS +=	--disable-gimp
 
-configure:	$(CONFIGURE_32)
+configure:	$(CONFIGURE_64)
 
 # Enable ASLR for this component
 ASLR_MODE = $(ASLR_ENABLE)
 
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
 
 
-REQUIRED_PACKAGES += image/editor/gimp
 REQUIRED_PACKAGES += image/scanner/xsane/sane-backends
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/glib2

--- a/components/sane-frontends/sane-frontends.p5m	Tue Jun 09 06:09:29 2015 -0700
+++ b/components/sane-frontends/sane-frontends.p5m	Tue Jun 09 19:08:23 2015 -0700
@@ -33,6 +33,6 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/xscanimage
+file usr/bin/$(MACH64)/xscanimage path=usr/bin/xscanimage
 file path=usr/share/man/man1/xscanimage.1
 license sane-frontend.license license=GPLv2