--- a/components/gnuplot/gnuplot.p5m	Wed Oct 22 15:26:11 2014 -0700
+++ b/components/gnuplot/gnuplot.p5m	Fri Oct 24 11:31:09 2014 -0700
@@ -35,7 +35,7 @@
 license gnuplot.license license=other
 
 
-file path=usr/bin/gnuplot mode=555
+file usr/bin/$(MACH64)/gnuplot path=usr/bin/gnuplot mode=555
 file path=usr/demo/gnuplot/1.dat
 file path=usr/demo/gnuplot/2.dat
 file path=usr/demo/gnuplot/3.dat
@@ -54,9 +54,9 @@
 file path=usr/demo/gnuplot/barchart_art.dem
 file path=usr/demo/gnuplot/big_peak.dat
 file path=usr/demo/gnuplot/binary.dem
-file $(MACH32)/demo/binary1 path=usr/demo/gnuplot/binary1
-file $(MACH32)/demo/binary1 path=usr/demo/gnuplot/binary2
-file $(MACH32)/demo/binary1 path=usr/demo/gnuplot/binary3
+file $(MACH64)/demo/binary1 path=usr/demo/gnuplot/binary1
+file $(MACH64)/demo/binary2 path=usr/demo/gnuplot/binary2
+file $(MACH64)/demo/binary3 path=usr/demo/gnuplot/binary3
 file path=usr/demo/gnuplot/bivariat.dem
 file path=usr/demo/gnuplot/bldg.png
 file path=usr/demo/gnuplot/blutux.rgb
@@ -206,7 +206,7 @@
 file path=usr/demo/gnuplot/world.dat
 file path=usr/demo/gnuplot/world.dem
 file path=usr/demo/gnuplot/world2.dem
-file path=usr/lib/gnuplot/4.6/gnuplot_x11 mode=555
+file path=usr/lib/$(MACH64)/gnuplot/4.6/gnuplot_x11 mode=555
 file path=usr/share/emacs/site-lisp/gnuplot-gui.el
 file path=usr/share/emacs/site-lisp/gnuplot-gui.elc
 file path=usr/share/emacs/site-lisp/gnuplot.el