diff --git a/trunk/BuildOsxPkg.sh b/trunk/BuildOsxPkg.sh
index 3708c02..c885b7d 100755
--- a/trunk/BuildOsxPkg.sh
+++ b/trunk/BuildOsxPkg.sh
@@ -1,42 +1,49 @@
 #!/bin/bash
 
 if [ "$(whoami)" != "root" ]; then
   echo "ERROR: This script has to be run as root!"
   exit 1
 fi
 
 CWD=`dirname "$0"`
 DSTROOT="$CWD/dstroot"
 FULL_PKG_NAME=`basename "$CWD"`
-PKG_VERSION_LONG=`echo "$FULL_PKG_NAME" | cut -d"-" -f2`
-PKG_VERSION_SHORT=`echo "$PKG_VERSION_LONG" | tr -d "."`
+PKG_VERSION=`echo "$FULL_PKG_NAME" | cut -d"-" -f2`
+
+echo "==== PKG build settings ==="
+echo "\$CWD=\"$CWD\""
+echo "\$DSTROOT=\"$DSTROOT\""
+echo "\$PKG_VERSION_LONG=\"$PKG_VERSION_LONG\""
+echo "\$PKG_VERSION_SHORT=\"$PKG_VERSION_SHORT\""
+echo
+echo "Press any key to continue or Ctrl-C to cancel"
+read
 
 # Create new dstroot folder
 rm -rf "$DSTROOT" &>/dev/null
 mkdir -p "$DSTROOT"/usr/local/bin
 mkdir -p "$DSTROOT"/usr/local/lib/xmount
 mkdir -p "$DSTROOT"/usr/local/share/man/man1
 
 # Populate dstroot with files
 cp "$CWD"/build/src/xmount "$DSTROOT"/usr/local/bin/
-cp "$CWD"/build/libxmount_input/libxmount_input_aaf/libxmount_input_aaff.dylib "$DSTROOT"/usr/local/lib/xmount/
+cp "$CWD"/build/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.dylib "$DSTROOT"/usr/local/lib/xmount/
 cp "$CWD"/build/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.dylib "$DSTROOT"/usr/local/lib/xmount/
 cp "$CWD"/build/libxmount_input/libxmount_input_aff/libxmount_input_aff.dylib "$DSTROOT"/usr/local/lib/xmount/
 cp "$CWD"/build/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.dylib "$DSTROOT"/usr/local/lib/xmount/
 cp "$CWD"/build/libxmount_input/libxmount_input_raw/libxmount_input_raw.dylib "$DSTROOT"/usr/local/lib/xmount/
 cp "$CWD"/xmount.1 "$DSTROOT"/usr/local/share/man/man1/
 
 # Patch 01dstroot-contents.xml
 sed -i -e "s#PMDOC_DSTROOT#$DSTROOT#g" "$CWD"/xmount.pmdoc/01dstroot-contents.xml
 
 # Patch 01dstroot.xml
 sed -i -e "s#PMDOC_DSTROOT#$DSTROOT#g" "$CWD"/xmount.pmdoc/01dstroot.xml
-sed -i -e "s/PMDOC_VERSION/$PKG_VERSION_SHORT/g" "$CWD"/xmount.pmdoc/01dstroot.xml
+sed -i -e "s/PMDOC_VERSION/$PKG_VERSION/g" "$CWD"/xmount.pmdoc/01dstroot.xml
 
 # Patch index.xml
 sed -i -e "s#PMDOC_CWD#$CWD#g" "$CWD"/xmount.pmdoc/index.xml
-sed -i -e "s/PMDOC_LVERSION/$PKG_VERSION_LONG/g" "$CWD"/xmount.pmdoc/index.xml
-sed -i -e "s/PMDOC_VERSION/$PKG_VERSION_SHORT/g" "$CWD"/xmount.pmdoc/index.xml
+sed -i -e "s/PMDOC_VERSION/$PKG_VERSION/g" "$CWD"/xmount.pmdoc/index.xml
 
 open "$CWD"/xmount.pmdoc
 
diff --git a/trunk/xmount.pmdoc/01dstroot.xml b/trunk/xmount.pmdoc/01dstroot.xml
index 7803f0e..b9753ec 100644
--- a/trunk/xmount.pmdoc/01dstroot.xml
+++ b/trunk/xmount.pmdoc/01dstroot.xml
@@ -1,24 +1,24 @@
 <pkgref spec="1.12" uuid="602B5E40-A3B9-4044-BF85-7BA882D111BE">
   <config>
-    <identifier>www.pinguin.lu.xmountPMDOC_VERSION.dstroot.pkg</identifier>
+    <identifier>www.pinguin.lu.xmount.PMDOC_VERSION.dstroot.pkg</identifier>
     <version>1</version>
     <description></description>
     <post-install type="none"/>
     <requireAuthorization/>
     <installFrom>PMDOC_DSTROOT</installFrom>
     <installTo>/</installTo>
     <flags>
       <followSymbolicLinks/>
     </flags>
     <packageStore type="internal"></packageStore>
     <mod>parent</mod>
   </config>
   <contents>
     <file-list>01dstroot-contents.xml</file-list>
     <filter>/CVS$</filter>
     <filter>/\.svn$</filter>
     <filter>/\.cvsignore$</filter>
     <filter>/\.cvspass$</filter>
     <filter>/\.DS_Store$</filter>
   </contents>
 </pkgref>
diff --git a/trunk/xmount.pmdoc/index.xml b/trunk/xmount.pmdoc/index.xml
index 0834ea2..52a7b8c 100644
--- a/trunk/xmount.pmdoc/index.xml
+++ b/trunk/xmount.pmdoc/index.xml
@@ -1,85 +1,85 @@
 <pkmkdoc spec="1.12">
   <properties>
-    <title>xmount PMDOC_LVERSION</title>
-    <build>PMDOC_CWD/xmount-PMDOC_LVERSION.pkg</build>
+    <title>xmount PMDOC_VERSION</title>
+    <build>PMDOC_CWD/xmount-PMDOC_VERSION.pkg</build>
     <organization>www.pinguin.lu</organization>
     <userSees ui="easy"/>
     <min-target os="3"/>
     <domain anywhere="true"/>
   </properties>
   <distribution>
     <versions min-spec="1.000000"/>
     <scripts></scripts>
   </distribution>
   <contents>
     <choice title="dstroot" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false">
-      <pkgref id="www.pinguin.lu.xmountPMDOC_VERSION.dstroot.pkg"/>
+      <pkgref id="www.pinguin.lu.xmount.PMDOC_VERSION.dstroot.pkg"/>
     </choice>
   </contents>
   <resources bg-scale="none" bg-align="topleft">
     <locale lang="en">
       <resource mime-type="text/rtf" kind="embedded" type="license">
 <![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 xmount Copyright (c) 2008-2012 by Gillen Daniel\
 \
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
 \
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\
 \
 You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.\
 \
 This version of xmount includes the following statically linked libraries:\
 \
 ==== LIBEWF\
  Copyright (c) 2006-2009, Joachim Metz <forensics@hoffmannbv.nl>, Hoffmann Investigations.\
 \
 This software is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
 \
 This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\
 \
 You should have received a copy of the GNU Lesser General Public License along with this software.  If not, see <http://www.gnu.org/licenses/>.\
 \
 ==== AFFLIB\
 Copyright (c) 2005, 2006, 2007 Simson L. Garfinkel and Basis Technology Corp. All rights reserved.\
 \
 This code is derrived from software contributed by Simson L. Garfinkel\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
 \
 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\
 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\
 3. All advertising materials mentioning features or use of this software must display the following acknowledgement:\
 This product includes software developed by Simson L. Garfinkel and Basis Technology Corp.\
 4. Neither the name of Simson L. Garfinkel, Basis Technology, or other contributors to this program may be used to endorse or promote products derived from this software without specific prior written permission.\
 \
 THIS SOFTWARE IS PROVIDED BY SIMSON L. GARFINKEL, BASIS TECHNOLOGY, AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SIMSON L. GARFINKEL, BASIS TECHNOLOGY, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  \
 \
 AFF and AFFLIB is a trademark of Simson Garfinkel and Basis Technology Corp.}]]>
       </resource>
       <resource mime-type="text/rtf" kind="embedded" type="readme">
 <![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \deftab480
 \pard\tx480\pardeftab480\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 xmount is a small tool to convert various forensic harddisk image formats on-the-fly to raw DD, DMG, VDI, VHD or VMDK files and enable virtual write access to them.}]]>
       </resource>
     </locale>
   </resources>
   <requirements>
     <requirement id="file" operator="eq" value="true">
       <file>/Library/Filesystems/osxfusefs.fs/Support/osxfusefs.kext</file>
       <message-title>OSXFUSE missing</message-title>
       <message>Your system does not seem to have MacFUSE installed. Get it from http://osxfuse.github.com/ and install it prior to launching this installer.</message>
     </requirement>
   </requirements>
   <flags/>
   <item type="file">01dstroot.xml</item>
   <mod>properties.systemDomain</mod>
   <mod>properties.title</mod>
 </pkmkdoc>