diff --git a/packages/compiler/berkeley_upc-2.12.2 b/packages/compiler/berkeley_upc-2.12.2
new file mode 100755
index 0000000..154df3b
--- /dev/null
+++ b/packages/compiler/berkeley_upc-2.12.2
@@ -0,0 +1,29 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
+#
+ 
+CATEGORY="compiler"
+PACKAGE="berkeley_upc"
+VERSION="2.12.2"
+
+PACKAGENAME=""
+URL="http://upc.lbl.gov"
+INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+
+# Archive A and package name P
+A=${PACKAGE}-${VERSION}.tar.gz
+P=${PACKAGE}-${VERSION}
+
+module load compiler/berkeley_upc_translator
+
+MAKEOPTS+=" MPI_CC=$MPICC"
+
+# Other interesting configure options:
+#		--with-multiconf=+dbg_tv
+#		--with-multiconf=+opt_inst
+CONFIGURE_OPTS=" \
+		BUPC_TRANS=$BUPC_TRANSLATOR
+        "
+# GCCUPC_TRANS=PATH --with-multiconf=+dbg_gccupc,+opt_gccupc
diff --git a/packages/compiler/berkeley_upc_translaotr-2.12.2 b/packages/compiler/berkeley_upc_translaotr-2.12.2
new file mode 100755
index 0000000..f9b5371
--- /dev/null
+++ b/packages/compiler/berkeley_upc_translaotr-2.12.2
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Berkeley UPC translator sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
+#
+ 
+CATEGORY="compiler"
+PACKAGE="berkeley_upc_translator"
+VERSION="2.12.2"
+
+PACKAGENAME="Berkeley UPC-to-C translator"
+URL="http://upc.lbl.gov/"
+INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+
+# Archive A and package name P
+A=${PACKAGE}-${VERSION}.tar.gz
+P=${PACKAGE}-${VERSION}
+ 
+BUILDDIR=$SRCDIR
+MAKEOPTS=""
+
+src_configure() {
+	sit_info "nothing to do for the translator"
+	/bin/true
+}
+
+src_install() {
+	sit_info $PWD
+    make install PREFIX=$PREFIX
+}
diff --git a/sit b/sit
index cb19e05..f14d1cb 100755
--- a/sit
+++ b/sit
@@ -102,7 +102,8 @@ if [ ! -z "$MPI" ] ; then
     fi  
     echo "Loading MPI module ${MPI_MODULE}"
     module load $MPI_MODULE
-    MPI_DIR=${MPI_DIR:=$(dirname $(dirname $(which mpicc)))}
+    MPICC="mpicc"
+    MPI_DIR=${MPI_DIR:=$(dirname $(dirname $(which $MPICC)))}
 fi