diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e658e43
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+.couchdb-downloaded
+.couchdb-installed
+.erlang-downloaded
+.erlang-installed
+.js-downloaded
+.js-installed
+couchdbx-core--R13B01.tar.gz
+couchdbx-core/
+dist/
+src/couchdb/
+src/erlang/
+src/js-1.7.0.tar.gz
+src/js/
+src/otp_src_R13B01.tar.gz
diff --git a/couchdbx-core-builder.sh b/couchdbx-core-builder.sh
index c259e34..a1b265e 100755
--- a/couchdbx-core-builder.sh
+++ b/couchdbx-core-builder.sh
@@ -190,8 +190,10 @@ couchdb_link_erl_driver()
 
 couchdb_post_install()
 {
-  # build couch_erl_driver.so against bundlered ICU
-  couchdb_link_erl_driver
+  if [ "`uname`" eq "Darwin"]; then
+    # build couch_erl_driver.so against bundlered ICU
+    couchdb_link_erl_driver
+  fi
 
   cd ../../dist/couchdb
   # replace absolute to relative paths
@@ -245,13 +247,19 @@ download_js()
 install_js()
 {
   if [ ! -e .js-installed ]; then
+    uname=`uname`
+    if [ "$uname" -eq "Darwin" ]; then
+      soext="dylib"
+    else
+      soext="so"
+    fi
     cd src/js
     cd src
     make $MAKEOPTS -f Makefile.ref
     JS_DIST=$WORKDIR/dist/js make -f Makefile.ref export
     cd ../../../
-    mkdir dist/Darwin_DBG.OBJ/
-    cp dist/js/lib/libjs.dylib dist/Darwin_DBG.OBJ/libjs.dylib
+    mkdir -p dist/${uname}_DBG.OBJ/
+    cp dist/js/lib*/libjs.$soext dist/${uname}_DBG.OBJ/libjs.$soext
     touch .js-installed
   fi
 }
@@ -273,7 +281,7 @@ package()
   rm -rf couchdbx-core
   mkdir couchdbx-core
   cp -r dist/* couchdbx-core
-  tar czf couchdbx-core-$COCUHDB_VERSION-$ERLANG_VERSION.tar.gz couchdbx-core
+  tar czf couchdbx-core-$COUCHDB_VERSION-$ERLANG_VERSION.tar.gz couchdbx-core
 }
 
 # main: