diff --git a/applications/lazimageeditor/createbundle.sh b/applications/lazimageeditor/createbundle.sh
new file mode 100755
index 000000000..d9b84c40a
--- /dev/null
+++ b/applications/lazimageeditor/createbundle.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+# Force Bourne shell in case tcsh is default.
+#
+
+#
+# Reads the bundle type
+#
+
+echo "========================================================"
+echo " Bundle creation script"
+echo "========================================================"
+echo ""
+echo " Please select which kind of bundle you would like to build:"
+echo ""
+echo " 1 > Debug bundle"
+echo " 2 > Release bundle"
+echo " 0 > Exit"
+
+read command
+
+case $command in
+
+ 1) ;;
+
+ 2) ;;
+
+ 0) exit 0;;
+
+ *) echo "Invalid command"
+ exit 0;;
+
+esac
+
+#
+# Creates the bundle
+#
+
+appname=LazarusImageEditor
+appfolder=$appname.app
+macosfolder=$appfolder/Contents/MacOS
+plistfile=$appfolder/Contents/Info.plist
+appfile=lazimageeditor
+
+PkgInfoContents="APPLMAG#"
+
+#
+if ! [ -e $appfile ]
+then
+ echo "$appfile does not exist"
+elif [ -e $appfolder ]
+then
+ echo "$appfolder already exists"
+else
+ echo "Creating $appfolder..."
+ mkdir $appfolder
+ mkdir $appfolder/Contents
+ mkdir $appfolder/Contents/MacOS
+ mkdir $appfolder/Contents/Resources
+
+#
+# For a debug bundle,
+# Instead of copying executable into .app folder after each compile,
+# simply create a symbolic link to executable.
+#
+if [ $command = 1 ]; then
+ ln -s ../../../$appfile $macosfolder/$appfile
+else
+ cp $appfile $macosfolder/$appfile
+fi
+
+# Copy the resource files to the correct place
+# cp *.bmp $appfolder/Contents/Resources
+# cp icon3.ico $appfolder/Contents/Resources
+# cp icon3.png $appfolder/Contents/Resources
+# cp macicon.icns $appfolder/Contents/Resources
+# cp docs/*.* $appfolder/Contents/Resources
+#
+# Create PkgInfo file.
+ echo $PkgInfoContents >$appfolder/Contents/PkgInfo
+#
+# Create information property list file (Info.plist).
+ echo '' >$plistfile
+ echo '' >>$plistfile
+ echo '' >>$plistfile
+ echo '' >>$plistfile
+ echo ' CFBundleDevelopmentRegion' >>$plistfile
+ echo ' English' >>$plistfile
+ echo ' CFBundleExecutable' >>$plistfile
+ echo ' '$appfile'' >>$plistfile
+ echo ' CFBundleIconFile' >>$plistfile
+ echo ' macicon.icns' >>$plistfile
+ echo ' CFBundleIdentifier' >>$plistfile
+ echo ' org.pascal.lazarusimageeditor' >>$plistfile
+ echo ' CFBundleInfoDictionaryVersion' >>$plistfile
+ echo ' 6.0' >>$plistfile
+ echo ' CFBundlePackageType' >>$plistfile
+ echo ' APPL' >>$plistfile
+ echo ' CFBundleSignature' >>$plistfile
+ echo ' IMG#' >>$plistfile
+ echo ' CFBundleVersion' >>$plistfile
+ echo ' 1.0' >>$plistfile
+ echo '' >>$plistfile
+ echo '' >>$plistfile
+fi
diff --git a/applications/lazimageeditor/lazimageeditor.lpi b/applications/lazimageeditor/lazimageeditor.lpi
index d308ca440..b91f40879 100644
--- a/applications/lazimageeditor/lazimageeditor.lpi
+++ b/applications/lazimageeditor/lazimageeditor.lpi
@@ -4,11 +4,11 @@
+
-
@@ -16,7 +16,7 @@
-
+
@@ -36,20 +36,17 @@
+
-
+
-
-
-
-
@@ -58,512 +55,75 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/applications/lazimageeditor/lazimageeditor.pas b/applications/lazimageeditor/lazimageeditor.pas
index e4aec2694..408165dee 100644
--- a/applications/lazimageeditor/lazimageeditor.pas
+++ b/applications/lazimageeditor/lazimageeditor.pas
@@ -7,8 +7,16 @@ uses
cthreads,
{$ENDIF}{$ENDIF}
Interfaces, // this includes the LCL widgetset Preview,
- Forms, Main, PictureManager, PictureCtrls, Test,
- NewDialog, ResizeDialog, ResizePaperDialog, PictureDialog, AboutDialog;
+ Forms,
+ Main,
+ PictureManager,
+ PictureCtrls,
+ Test,
+ NewDialog,
+ ResizeDialog,
+ ResizePaperDialog,
+ PictureDialog,
+ AboutDialog, DLBitmap;
{$R *.res}