diff --git a/Formula/pig.rb b/Formula/pig.rb
index 36a6e3b9cb6..d8071eb24db 100644
--- a/Formula/pig.rb
+++ b/Formula/pig.rb
@@ -10,25 +10,30 @@ class Pig < Formula
   end
 
   def install
-    rm_f Dir["bin/*.bat"]
-    prefix.install ['bin', "pig-#{version}.jar"]
+    bin.install 'bin/pig'
+    prefix.install "pig-#{version}.jar"
+    prefix.install "pig-#{version}-withouthadoop.jar"
   end
 end
 
 # There's something weird with Pig's launch script, it doesn't find the correct
-# path. This patch removes a test that should fail, but doesn't.
+# path. This patch finds PIG_HOME from the pig binary path's symlink.
 __END__
-diff --git a/bin/pig b/bin/pig
-index 97fc649..79056cf 100644
---- a/bin/pig
-+++ b/bin/pig
-@@ -61,6 +61,10 @@
- script="$(basename -- "$this")"
- this="$bin/$script"
+diff -u a/bin/pig b/bin/pig
+--- a/bin/pig 2011-09-30 08:55:58.000000000 +1000
++++ b/bin/pig 2011-11-28 11:18:36.000000000 +1100
+@@ -55,11 +55,8 @@
+
+ # resolve links - $0 may be a softlink
+ this="${BASH_SOURCE-$0}"
+-
+-# convert relative path to absolute path
+-bin=$(cd -P -- "$(dirname -- "$this")">/dev/null && pwd -P)
+-script="$(basename -- "$this")"
+-this="$bin/$script"
++here=$(dirname $this)
++this="$here"/$(readlink $this)
 
-+ls=`ls -ld "$this"`
-+link=`expr "$ls" : '.*-> \(.*\)$'`
-+this=`dirname "$this"`/"$link"
-+
  # the root of the Pig installation
  export PIG_HOME=`dirname "$this"`/..
+