diff --git a/scripts/mac-create-app-bundle.sh b/scripts/mac-create-app-bundle.sh
index 1b8f511..7ff4573 100755
--- a/scripts/mac-create-app-bundle.sh
+++ b/scripts/mac-create-app-bundle.sh
@@ -7,7 +7,7 @@
 ## Parameters:
 ##  $1: name of the app-target
 ##  $2: name of the project
-##  $3: installation source
+##  $3: package installation target
 ##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
@@ -16,31 +16,33 @@ if test "$(uname -s)" != "Darwin"; then
     echo "**** ERROR: run on Mac OS-X: $0"
     exit 1
 fi
-test -n "$1"
-test -n "$2"
-test -d "$3"
-target="$(pwd)/${1}/Contents/MacOS"
+
+cd ${0%/*}
+
+project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)}
+apptarget=${1:-${project}.app}
+sources=${3:-$(pwd)/usr}
+test -n "$project"
+test -d "$sources"
+! test -e "$apptarget" || rm -rf "$apptarget"
+target="$(pwd)/${apptarget}/Contents/MacOS"
+
+echo "Creating $apptarget for $project from $sources"
 
 # Step 1: create and fill app directory structure
-mkdir -p ${1}/Contents/{Resources,MacOS}
-! test -d ${3}/bin || \
-     find ${3}/bin -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \;
-executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1)
-! test -d ${3}/lib || \
-    find ${3}/lib -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \;
-! test -d ${3}/share/${2} || \
-    find ${3}/share/${2} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
-! test -d ${3}/share/${2} || rmdir ${3}/share/${2}
-! test -d ${3}/share || \
-    find ${3}/share -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
-! test -d ${3}/bin || rmdir ${3}/bin
-! test -d ${3}/lib || rmdir ${3}/lib
-! test -d ${3}/share || rmdir ${3}/share
-! test -d ${3} || \
-    find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
-! test -d ${3}/include || rm -r ${3}/include
-! test -d ${3} || rmdir ${3}
-! test -d ${1}/tmp || rm -r ${1}/tmp
+mkdir -p ${apptarget}/Contents/{Resources,MacOS}
+! test -d ${sources}/bin || \
+     find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
+executablefile=${apptarget}/Contents/MacOS/${project}
+test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1)
+! test -d ${sources}/lib || \
+    find ${sources}/lib -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
+! test -d ${sources}/share/${project} || \
+    find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
+! test -d ${sources}/share || \
+    find ${sources}/share -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
+! test -d ${sources} || \
+    find ${sources} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
 
 # Step 2: copy qt plugins, if necessary
 for f in ${QT_PLUGINS}; do
@@ -79,23 +81,23 @@ if test -n "${QTDIR}"; then
     MENU_NIB=$(find ${QTDIR} -name .svn -o -name .git -prune -o -name qt_menu.nib -print \
                | head -1)
     if test -e "${MENU_NIB}"; then
-        rsync -r "${MENU_NIB}" ${1}/Contents/Resources/
-        test -d ${1}/Contents/Resources/qt_menu.nib
+        rsync -r "${MENU_NIB}" ${apptarget}/Contents/Resources/
+        test -d ${apptarget}/Contents/Resources/qt_menu.nib
     fi
 fi
 
 # Step 5: copy or create info.plist
-infoplist=$(find ${1}/Contents/Resources -name Info.plist)
+infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist)
 if test -f "${infoplist}"; then
-    mv "${infoplist}" ${1}/Contents/Info.plist
+    cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
 else
-    cat > ${1}/Contents/Info.plist <<EOF
+    cat > ${apptarget}/Contents/Info.plist <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
     <key>CFBundleIdentifier</key>
-    <string>${2}</string>
+    <string>${project}</string>
     <key>CFBundleExecutable</key>
     <string>${executablefile##/}</string>
   </dict>