diff --git a/packages/mpi/mvapich2-1.6rc3 b/packages/mpi/mvapich2-1.6rc3
index e444339..3bc77de 100755
--- a/packages/mpi/mvapich2-1.6rc3
+++ b/packages/mpi/mvapich2-1.6rc3
@@ -17,12 +17,9 @@ P=${PACKAGE}-${VERSION}
 # Circumvent problems with parallel build
 MAKEOPTS="-j1"
 
+
+# Other interesting configure options:
+#--with-file-system=lustre
 CONFIGURE_OPTS="\
         --enable-sharedlibs=gcc \
 		"
-# Other interesting configure options:
-#--with-file-system=lustre
-#--enable-sharedlibs=gcc \
-
-
-
diff --git a/packages/mpi/openmpi-1.5.1 b/packages/mpi/openmpi-1.5.1
index 548d7ad..c403b32 100755
--- a/packages/mpi/openmpi-1.5.1
+++ b/packages/mpi/openmpi-1.5.1
@@ -14,14 +14,14 @@ INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
 A=${PACKAGE}-${VERSION}.tar.bz2
 P=${PACKAGE}-${VERSION}
  
+
+# Other interesting configure options:
+# --enable-mpi-threads
+# --enable-progress-threads
+# --with-fca=DIR
 CONFIGURE_OPTS="
         --with-devel-headers \
         --enable-contrib-no-build=vt
         --enable-shared \
         -enable-static \
         "
-# Other interesting configure options:
-# --enable-mpi-threads
-# --enable-progress-threads
-# --with-fca=DIR
-
diff --git a/packages/performance/extrae-2.1.1 b/packages/performance/extrae-2.1.1
index af3d77c..583d5ab 100755
--- a/packages/performance/extrae-2.1.1
+++ b/packages/performance/extrae-2.1.1
@@ -14,13 +14,16 @@ INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
 A=${PACKAGE}-${VERSION}.tar.bz2
 P=${PACKAGE}-${VERSION}
  
-enable_papi=0
+enable_papi=${enable_papi:=0}
 
+
+# Other interesting configure options:
 CONFIGURE_OPTS="\
 		--with-mpi=$MPI_DIR \
 		--enable-sampling \
 		"
 
+
 # use PAPI
 if [ $enable_papi != 0 ] ; then
     module load system/perfctr system/papi
@@ -28,6 +31,8 @@ if [ $enable_papi != 0 ] ; then
     CONFIGURE_OPTS="$CONFIGURE_OPTS --with-papi=$PAPI_DIR"
 fi
 
+# currently extrae has to be build in the source directory
+BUILDDIR="${SRCDIR}"
 
 src_install() {
     mkdir -p $PREFIX
diff --git a/packages/performance/vampirtrace-5.10 b/packages/performance/vampirtrace-5.10
index e4614bb..35a9fae 100755
--- a/packages/performance/vampirtrace-5.10
+++ b/packages/performance/vampirtrace-5.10
@@ -17,12 +17,12 @@ P="VampirTrace-${VERSION}"
 enable_papi=${enable_papi:=0}
 enable_papi=${enable_cuda:=0}
 
+
+# Other interesting configure options:
+#--enable-sampling \
 CONFIGURE_OPTS="\
 		--with-mpi-dir=$MPI_DIR \
 		"
-# Other interesting configure options:
-#--enable-sampling \
-
 
 # use PAPI
 if [ $enable_papi != 0 ] ; then
@@ -43,5 +43,3 @@ if [ $enable_cuda != 0 ] ; then
         --with-cudart-lib-dir=$CUDA_DIR/lib64 \
         "
 fi
-
-