diff --git a/ChangeLog b/ChangeLog
index 5541e4f52..d8960d847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-03  Wade Berrier  <wberrier@novell.com>
+
+	* generator/gapi2-codegen.in:
+	* parser/gapi2-fixup.in:
+	* parser/gapi2-parser.in:
+	Don't use 'which' anymore, as it doesn't work in all caes (ie: when symlinks are
+	in the way)
+
 2007-04-28  Mike Kestner  <mkestner@novell.com>
 
 	* generator/NativeCallbackSignature.cs :
diff --git a/generator/gapi2-codegen.in b/generator/gapi2-codegen.in
index 6444f2ea4..b7a2621f6 100755
--- a/generator/gapi2-codegen.in
+++ b/generator/gapi2-codegen.in
@@ -1,6 +1,2 @@
 #!/bin/sh
-
-a=`which "$0"`
-d=`dirname "$a"`
-
-@RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
+@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi_codegen.exe "$@"
diff --git a/parser/gapi2-fixup.in b/parser/gapi2-fixup.in
index 497729fe0..906ddf611 100755
--- a/parser/gapi2-fixup.in
+++ b/parser/gapi2-fixup.in
@@ -1,6 +1,2 @@
 #!/bin/sh
-
-a=`which "$0"`
-d=`dirname "$a"`
-
-@RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
+@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-fixup.exe "$@"
diff --git a/parser/gapi2-parser.in b/parser/gapi2-parser.in
index d78140f80..25e54ca38 100755
--- a/parser/gapi2-parser.in
+++ b/parser/gapi2-parser.in
@@ -1,7 +1,3 @@
 #!/bin/sh
-
-a=`which "$0"`
-d=`dirname "$a"`
-
-export PATH=$d/../lib/gtk-sharp-2.0:$PATH
-@RUNTIME@ $d/../lib/gtk-sharp-2.0/gapi-parser.exe "$@"
+export PATH=@prefix@/lib/gtk-sharp-2.0:$PATH
+@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi-parser.exe "$@"