diff --git a/x10.gl/build.sh b/x10.gl/build.sh
index c7c536fbda..26c1239142 100755
--- a/x10.gl/build.sh
+++ b/x10.gl/build.sh
@@ -1,11 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-cd src-x10
-find -print0 -name '*.x10' | xargs -0 jar cf ../x10_gl.jar
-cd ..
+(cd src-x10; find . -name '*.x10' -print0 | xargs -0 jar cf ../x10_gl.jar)
 
 ../x10.dist/bin/x10c++ -O -NO_CHECKS -STATIC_CHECKS -buildx10lib . src-x10/x10/gl/GL.x10 -o x10_gl -d include -cxx-postarg -lGL -cxx-postarg -lglut -cxx-postarg -lGLEW
 
-cd include
-find -name '*.cc'  -print0 | xargs -0 rm
-cd ..
+(cd include; find . -name '*.cc' -print0 | xargs -0 rm)
diff --git a/x10.gl/clean.sh b/x10.gl/clean.sh
index d725317b6f..00962f9d03 100755
--- a/x10.gl/clean.sh
+++ b/x10.gl/clean.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 rm -rf lib/* include/* *.jar *.properties