diff --git a/packages/performance/scalasca-1.4 b/packages/performance/scalasca-1.4
index f0ffd4a..99fda92 100755
--- a/packages/performance/scalasca-1.4
+++ b/packages/performance/scalasca-1.4
@@ -26,7 +26,7 @@ enable_papi=${enable_papi:=1}
 
 # use PAPI
 if [ $enable_papi != 0 ] ; then
-    module load performance/papi
+    module load papi
     PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
     CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi=$PAPI_DIR"
 fi
diff --git a/packages/performance/vampirtrace-5.12.1 b/packages/performance/vampirtrace-5.12.1
new file mode 100755
index 0000000..b052aae
--- /dev/null
+++ b/packages/performance/vampirtrace-5.12.1
@@ -0,0 +1,46 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
+#
+ 
+CATEGORY="performance"
+PACKAGE="vampirtrace"
+VERSION="5.12.1"
+URL="http://www.tu-dresden.de/zih/vampirtrace/"
+INSTALLER="Rainer Keller <keller@hlrs.de>"
+
+
+# Archive A and package name P
+A="VampirTrace-${VERSION}.tar.gz"
+P="VampirTrace-${VERSION}"
+
+enable_papi=${enable_papi:=1}
+enable_papi=${enable_cuda:=0}
+
+
+# Other interesting configure options:
+#--enable-sampling \
+CONFIGURE_OPTS="$CONFIGURE_OPTS \
+		--with-mpi-dir=$MPI_DIR \
+		"
+
+# use PAPI
+if [ $enable_papi != 0 ] ; then
+    module load papi
+    PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
+    CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
+fi
+
+# use CUDA
+if [ $enable_cuda != 0 ] ; then
+    module load cuda
+    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
+    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+        --with-cuda-dir=$CUDA_DIR \
+        --with-cuda-inc-dir=$CUDA_DIR/include \
+        --with-cuda-lib-dir=$CUDA_DIR/lib \
+        --with-cudart-dir=$CUDA_DIR \
+        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
+        "
+fi