diff --git a/valgrind.be0 b/valgrind.be0
index 25186921a..2599a9c54 100755
--- a/valgrind.be0
+++ b/valgrind.be0
@@ -1,32 +1,86 @@
-#!/bin/env beesh
+#!/usr/bin/env beesh
 
-# BEE_VERSION valgrind-3.10.0-0
+# BEE_VERSION valgrind-3.11.0-0
+
+## this file was created by bee init and should be executed to build a
+## bee-package. (Additional hints are located at the end of this file.)
+
+###############################################################################
+## The source URL(s) define the location of the sources that will be
+## downloaded. Version variables may be used to simplify reuse of this bee-file.
+>>>>>>> 9ce34ee... valgrind: Add version 3.11.0
 
 SRCURL[0]="http://valgrind.org/downloads/valgrind-${PKGVERSION}.tar.bz2"
 
-PATCHURL[0]=""
+###############################################################################
+## Add URLs/pathes to patch files to the PATCHURL array.
+## The sources will be patched in the order of the array.
+
+# PATCHURL+=()
+
+###############################################################################
+## Add filename patterns to the EXCLUDE array of files that should not
+## be added to you package but may be present in the image directory.
+
+# EXCLUDE+=()
+
+###############################################################################
+## Uncomment the next statement, if the software may not be able to be build
+## outside the source directory and need to be build inside the source
+## directory.
+
+# build_in_sourcedir
+
+###############################################################################
+## bee cannot detect buildtypes specified in subdirectories.
+## Sometimes packages "hide" the real sources in a subdirectory named
+## 'src' or 'cmake' or ..
+## use 'sourcesubdir_append' to specify this directory if known.
 
-PGRP=( uncategorized )
+# sourcesubdir_append src
 
-B=${S}
 
+###############################################################################
+## Change the default (auto-detected) steps to
+## extract, patch, configure/setup, build and install the software.
+## Make sure the mee_install function does install everything to the
+## image directory "${D}"
 
-# BEE_CONFIGURE=compat
+#mee_extract() {
+#    bee_extract "${@}"
+#}
 
-# EXCLUDE=""
+#mee_patch() {
+#    bee_patch "${@}"
+#}
 
-mee_patch() {
-    bee_patch
-}
+#mee_configure() {
+#    bee_configure
+#}
 
-mee_configure() {
-    bee_configure
-}
+#mee_build() {
+#    bee_build
+#}
 
-mee_build() {
-    bee_build
-}
+#mee_install() {
+#    bee_install
+#}
+## by default this may be 'make install DESTDIR="${D}"'
 
-mee_install() {
-    bee_install
-}
+###############################################################################
+##
+## Additional hints:
+##
+## The name of this bee-file should follow the following naming convention:
+##     pkgname-pkgversion-pkgrevision.bee
+##
+## You may remove all comments as long as SRCURL[0] is set.
+##
+## Everything in this file will be executed in a bash environment.
+##
+## Build the package by executing
+##     './pkg-version-N.bee' or
+##     'beesh ./pkg-version-N.bee'
+##
+## see http://beezinga.org/
+##