diff -uNr digikam.orig/build.sh digikam/build.sh
--- digikam.orig/build.sh	2008-01-04 23:05:27.000000000 +0100
+++ digikam/build.sh	2008-01-04 23:54:31.000000000 +0100
@@ -10,15 +10,18 @@
 ##############################################################################
 
 # Get all the various language files and copy them to the PBI
-LANGFILE="digikam.mo"
+LANGFILES="digikam.mo libkdcraw.mo"
 mkdir ${PBIDIR}/locale/
 cd /usr/local/share/locale
 for i in `ls`
 do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
+  for j in ${LANGFILES}
+  do
+    if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${j}" ]
+    then
+      mkdir ${PBIDIR}/locale/${i}
+      cp /usr/local/share/locale/${i}/LC_MESSAGES/${j} ${PBIDIR}/locale/${i}/
+    fi
+  done
 done
 
diff -uNr digikam.orig/copy-files digikam/copy-files
--- digikam.orig/copy-files	2008-01-04 23:05:05.000000000 +0100
+++ digikam/copy-files	2008-01-04 23:56:51.000000000 +0100
@@ -1,13 +1,19 @@
 /usr/local/bin/digikam bin/
 /usr/local/bin/digikamthemedesigner bin/
 /usr/local/bin/digitaglinktree bin/
+/usr/local/bin/kdcraw bin/
 /usr/local/bin/showfoto bin/
 /usr/local/include/digikam include/
 /usr/local/include/digikam_export.h include/
+/usr/local/include/libkdcraw include/
 /usr/local/lib/libdigikam.a lib/
 /usr/local/lib/libdigikam.la lib/
 /usr/local/lib/libdigikam.so lib/
 /usr/local/lib/libdigikam.so.0 lib/
+/usr/local/lib/libkdcraw.a lib/
+/usr/local/lib/libkdcraw.la lib/
+/usr/local/lib/libkdcraw.so lib/
+/usr/local/lib/libkdcraw.so.2 lib/
 /usr/local/lib/kde3/digikamimageplugin_adjustcurves.a lib/kde3/
 /usr/local/lib/kde3/digikamimageplugin_adjustcurves.la lib/kde3/
 /usr/local/lib/kde3/digikamimageplugin_adjustcurves.so lib/kde3/
@@ -114,16 +120,20 @@
 /usr/local/share/apps/konqueror/servicemenus/digikam-mount-and-download.desktop share/apps/konqueror/servicemenus/
 /usr/local/share/apps/showfoto share/apps/showfoto
 /usr/local/share/icons/hicolor/128x128/apps/digikam.png share/icons/hicolor/128x128/apps/digikam.png
+/usr/local/share/icons/hicolor/128x128/apps/kdcraw.png share/icons/hicolor/128x128/apps/kdcraw.png
 /usr/local/share/icons/hicolor/128x128/apps/showfoto.png share/icons/hicolor/128x128/apps/showfoto.png
 /usr/local/share/icons/hicolor/16x16/apps/digikam.png share/icons/hicolor/16x16/apps/digikam.png
 /usr/local/share/icons/hicolor/16x16/apps/showfoto.png share/icons/hicolor/16x16/apps/showfoto.png
 /usr/local/share/icons/hicolor/22x22/apps/digikam.png share/icons/hicolor/22x22/apps/digikam.png
 /usr/local/share/icons/hicolor/22x22/apps/showfoto.png share/icons/hicolor/22x22/apps/showfoto.png
 /usr/local/share/icons/hicolor/32x32/apps/digikam.png share/icons/hicolor/32x32/apps/digikam.png
+/usr/local/share/icons/hicolor/32x32/apps/kdcraw.png share/icons/hicolor/32x32/apps/kdcraw.png
 /usr/local/share/icons/hicolor/32x32/apps/showfoto.png share/icons/hicolor/32x32/apps/showfoto.png
 /usr/local/share/icons/hicolor/48x48/apps/digikam.png share/icons/hicolor/48x48/apps/digikam.png
+/usr/local/share/icons/hicolor/48x48/apps/kdcraw.png share/icons/hicolor/48x48/apps/kdcraw.png
 /usr/local/share/icons/hicolor/48x48/apps/showfoto.png share/icons/hicolor/48x48/apps/showfoto.png
 /usr/local/share/icons/hicolor/64x64/apps/digikam.png share/icons/hicolor/64x64/apps/digikam.png
+/usr/local/share/icons/hicolor/64x64/apps/kdcraw.png share/icons/hicolor/64x64/apps/kdcraw.png
 /usr/local/share/icons/hicolor/64x64/apps/showfoto.png share/icons/hicolor/64x64/apps/showfoto.png
 /usr/local/share/services/digikamalbums.protocol share/services/
 /usr/local/share/services/digikamdates.protocol share/services/
diff -uNr digikam.orig/kmenu-dir/showfoto digikam/kmenu-dir/showfoto
--- digikam.orig/kmenu-dir/showfoto	1970-01-01 01:00:00.000000000 +0100
+++ digikam/kmenu-dir/showfoto	2008-01-05 00:02:35.000000000 +0100
@@ -0,0 +1,13 @@
+ExePath: bin/showfoto
+ExeIcon: share/icons/hicolor/32x32/apps/showfoto.png
+ExeDescr: showFoto
+ExeNoDesktop: 1
+ExeNoMenu: 1
+ExeRunRoot: 0
+ExeRunShell: 0
+ExeNotify: 1
+ExeLink: 0
+ExeWebLink: 0
+ExeTaskbar: 0
+ExeOwndir: 2
+ExeKdeCat: Graphics
diff -uNr digikam.orig/overlay-dir/PBI.RemoveScript.sh digikam/overlay-dir/PBI.RemoveScript.sh
--- digikam.orig/overlay-dir/PBI.RemoveScript.sh	2008-01-04 23:06:14.000000000 +0100
+++ digikam/overlay-dir/PBI.RemoveScript.sh	2008-01-04 23:31:50.000000000 +0100
@@ -7,15 +7,21 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -fR /usr/local/bin/digikam
+rm -fR /usr/local/bin/kdcraw
 rm -fR /usr/local/bin/digikamthemedesigner
 rm -fR /usr/local/bin/digitaglinktree
 rm -fR /usr/local/bin/showfoto
 rm -fR /usr/local/include/digikam
 rm -fR /usr/local/include/digikam_export.h
+rm -fR /usr/local/include/libkdcraw
 rm -fR /usr/local/lib/libdigikam.a
 rm -fR /usr/local/lib/libdigikam.la
 rm -fR /usr/local/lib/libdigikam.so
 rm -fR /usr/local/lib/libdigikam.so.0
+rm -fR /usr/local/lib/libkdcraw.a
+rm -fR /usr/local/lib/libkdcraw.la
+rm -fR /usr/local/lib/libkdcraw.so
+rm -fR /usr/local/lib/libkdcraw.so.0
 rm -fR /usr/local/lib/kde3/digikamimageplugin_adjustcurves.a
 rm -fR /usr/local/lib/kde3/digikamimageplugin_adjustcurves.la
 rm -fR /usr/local/lib/kde3/digikamimageplugin_adjustcurves.so
@@ -122,16 +128,20 @@
 rm -fR /usr/local/share/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
 rm -fR /usr/local/share/apps/showfoto share/apps/showfoto
 rm -fR /usr/local/share/icons/hicolor/128x128/apps/digikam.png
+rm -fR /usr/local/share/icons/hicolor/128x128/apps/kdcraw.png
 rm -fR /usr/local/share/icons/hicolor/128x128/apps/showfoto.png
 rm -fR /usr/local/share/icons/hicolor/16x16/apps/digikam.png
 rm -fR /usr/local/share/icons/hicolor/16x16/apps/showfoto.png
 rm -fR /usr/local/share/icons/hicolor/22x22/apps/digikam.png
 rm -fR /usr/local/share/icons/hicolor/22x22/apps/showfoto.png
 rm -fR /usr/local/share/icons/hicolor/32x32/apps/digikam.png
+rm -fR /usr/local/share/icons/hicolor/32x32/apps/kdcraw.png
 rm -fR /usr/local/share/icons/hicolor/32x32/apps/showfoto.png
 rm -fR /usr/local/share/icons/hicolor/48x48/apps/digikam.png
+rm -fR /usr/local/share/icons/hicolor/48x48/apps/kdcraw.png
 rm -fR /usr/local/share/icons/hicolor/48x48/apps/showfoto.png
 rm -fR /usr/local/share/icons/hicolor/64x64/apps/digikam.png
+rm -fR /usr/local/share/icons/hicolor/64x64/apps/kdcraw.png
 rm -fR /usr/local/share/icons/hicolor/64x64/apps/showfoto.png
 rm -fR /usr/local/share/services/digikamalbums.protocol
 rm -fR /usr/local/share/services/digikamdates.protocol
@@ -168,11 +178,14 @@
 rm -fR /usr/local/share/servicetypes/digikamimageplugin.desktop
 
 # Remove the old locale files since we are uninstalling
-LANGFILE="digikam.mo"
+LANGFILES="digikam.mo libkdcraw.mo"
 cd /Programs/${PROGDIR}/locale
 for i in `ls`
 do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
+  for j in ${LANGFILES}
+  do
+    rm /usr/local/share/locale/${i}/LC_MESSAGES/${j}
+  done
 done
 
 
diff -uNr digikam.orig/overlay-dir/PBI.SetupScript.sh digikam/overlay-dir/PBI.SetupScript.sh
--- digikam.orig/overlay-dir/PBI.SetupScript.sh	2008-01-04 23:05:58.000000000 +0100
+++ digikam/overlay-dir/PBI.SetupScript.sh	2008-01-04 23:52:43.000000000 +0100
@@ -15,15 +15,21 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/digikam /usr/local/bin/digikam
-ln -s /Programs/${PROGDIR}/.sbin/digikamthemedesigner /usr/local/bin/digikamthemedesigner
-ln -s /Programs/${PROGDIR}/.sbin/digitaglinktree /usr/local/bin/digitaglinktree
 ln -s /Programs/${PROGDIR}/.sbin/showfoto /usr/local/bin/showfoto
+ln -s /Programs/${PROGDIR}/bin/digikamthemedesigner /usr/local/bin/digikamthemedesigner
+ln -s /Programs/${PROGDIR}/bin/digitaglinktree /usr/local/bin/digitaglinktree
+ln -s /Programs/${PROGDIR}/bin/kdcraw /usr/local/bin/kdcraw
 ln -s /Programs/${PROGDIR}/include/digikam /usr/local/include/digikam
 ln -s /Programs/${PROGDIR}/include/digikam_export.h /usr/local/include/digikam_export.h
+ln -s /Programs/${PROGDIR}/include/libkdcraw /usr/local/include/libkdcraw
 ln -s /Programs/${PROGDIR}/lib/libdigikam.a /usr/local/lib/libdigikam.a
 ln -s /Programs/${PROGDIR}/lib/libdigikam.la /usr/local/lib/libdigikam.la
 ln -s /Programs/${PROGDIR}/lib/libdigikam.so /usr/local/lib/libdigikam.so
-ln -s /Programs/${PROGDIR}/lib/libdigikam.so.0 /usr/local/lib/libdigikam.so.0
+ln -s /Programs/${PROGDIR}/lib/libkdcraw.so.0 /usr/local/lib/libkdcraw.so.0
+ln -s /Programs/${PROGDIR}/lib/libkdcraw.a /usr/local/lib/libkdcraw.a
+ln -s /Programs/${PROGDIR}/lib/libkdcraw.la /usr/local/lib/libkdcraw.la
+ln -s /Programs/${PROGDIR}/lib/libkdcraw.so /usr/local/lib/libkdcraw.so
+ln -s /Programs/${PROGDIR}/lib/libkdcraw.so.2 /usr/local/lib/libkdcraw.so.2
 ln -s /Programs/${PROGDIR}/lib/kde3/digikamimageplugin_adjustcurves.a /usr/local/lib/kde3/digikamimageplugin_adjustcurves.a
 ln -s /Programs/${PROGDIR}/lib/kde3/digikamimageplugin_adjustcurves.la /usr/local/lib/kde3/digikamimageplugin_adjustcurves.la
 ln -s /Programs/${PROGDIR}/lib/kde3/digikamimageplugin_adjustcurves.so /usr/local/lib/kde3/digikamimageplugin_adjustcurves.so
@@ -130,16 +136,20 @@
 ln -s /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/digikam-mount-and-download.desktop /usr/local/share/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
 ln -s /Programs/${PROGDIR}/share/apps/showfoto share/apps/showfoto /usr/local/share/apps/showfoto share/apps/showfoto
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/digikam.png /usr/local/share/icons/hicolor/128x128/apps/digikam.png
+ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/kdcraw.png /usr/local/share/icons/hicolor/128x128/apps/kdcraw.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/showfoto.png /usr/local/share/icons/hicolor/128x128/apps/showfoto.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/digikam.png /usr/local/share/icons/hicolor/16x16/apps/digikam.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/showfoto.png /usr/local/share/icons/hicolor/16x16/apps/showfoto.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/digikam.png /usr/local/share/icons/hicolor/22x22/apps/digikam.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/showfoto.png /usr/local/share/icons/hicolor/22x22/apps/showfoto.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/digikam.png /usr/local/share/icons/hicolor/32x32/apps/digikam.png
+ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/kdcraw.png /usr/local/share/icons/hicolor/32x32/apps/kdcraw.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/showfoto.png /usr/local/share/icons/hicolor/32x32/apps/showfoto.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/digikam.png /usr/local/share/icons/hicolor/48x48/apps/digikam.png
+ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/kdcraw.png /usr/local/share/icons/hicolor/48x48/apps/kdcraw.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/showfoto.png /usr/local/share/icons/hicolor/48x48/apps/showfoto.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/digikam.png /usr/local/share/icons/hicolor/64x64/apps/digikam.png
+ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/kdcraw.png /usr/local/share/icons/hicolor/64x64/apps/kdcraw.png
 ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/showfoto.png /usr/local/share/icons/hicolor/64x64/apps/showfoto.png
 ln -s /Programs/${PROGDIR}/share/services/digikamalbums.protocol /usr/local/share/services/digikamalbums.protocol
 ln -s /Programs/${PROGDIR}/share/services/digikamdates.protocol /usr/local/share/services/digikamdates.protocol
@@ -176,12 +186,15 @@
 ln -s /Programs/${PROGDIR}/share/servicetypes/digikamimageplugin.desktop /usr/local/share/servicetypes/digikamimageplugin.desktop
 
 # Copy over all the LANG files
-LANGFILE="digikam.mo"
+LANGFILES="digikam.mo libkdcraw.mo"
 cd /Programs/${PROGDIR}/locale
 for i in `ls`
 do
   mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
+  for j in ${LANGFILES}
+  do
+    cp /Programs/${PROGDIR}/locale/${i}/${j} /usr/local/share/locale/${i}/LC_MESSAGES/
+  done
 done
 
 echo "LAUNCHCLOSE: /usr/local/bin/digikam"
diff -uNr digikam.orig/pbi.conf digikam/pbi.conf
--- digikam.orig/pbi.conf	2008-01-04 23:04:45.000000000 +0100
+++ digikam/pbi.conf	2008-01-04 23:07:15.000000000 +0100
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY