diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs-22.3/use-qemu.patch b/emacs/emacs-22.3/use-qemu.patch
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs-x11_20060801.bb b/emacs/emacs-x11_20060801.bb
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs-x11_22.3.bb b/emacs/emacs-x11_22.3.bb
index 03102bf..4475e08 100644
--- a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs-x11_22.3.bb
+++ b/emacs/emacs-x11_22.3.bb
@@ -1,12 +1,14 @@
 require emacs.inc
 
 # full X (non-diet) is needed for X support
-DEPENDS += "gtk+ libungif"
+DEPENDS += "gtk+ libungif libxpm"
 
-EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk"
+EXTRA_OECONF = "--without-sound --with-x-toolkit=gtk --with-xpm"
 
 RREPLACES = "emacs"
 
+PR="r1"
+
 FILESPATH = "${FILE_DIRNAME}/emacs-${PV}:${FILE_DIRNAME}/files"
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \
 	   file://use-qemu.patch;patch=1 \
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs-x11_cvs.bb b/emacs/emacs-x11_cvs.bb
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs.inc b/emacs/emacs.inc
index 05acd82..0464a26 100644
--- a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs.inc
+++ b/emacs/emacs.inc
@@ -5,6 +5,8 @@ SECTION = "editor"
 # and it needs to run some generated binaries..
 DEPENDS += "qemu-native"
 
+DEPENDS +=" liblockfile"
+
 inherit autotools
 
 PACKAGES =+ "${PN}-el"
@@ -16,8 +18,12 @@ FILES_${PN} += "${datadir}/emacs"
 
 FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug"
 
+TREEDIR = "${WORKDIR}/qemu-treedir"
+
 # Large stack is required at least on x86_64 host, otherwise random segfaults appear:
-QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}"
+QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR}"
+
+export LOGNAME = "$(whoami)"
 
 do_compile_prepend() {
 	sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile`
@@ -26,6 +32,19 @@ do_compile_prepend() {
 	ln -sf ../src/emacs lisp/emacs
 	ln -sf ../src/emacs lib-src/emacs
 	ln -sf ../src/emacs leim/emacs
+#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass
+	treedir=${TREEDIR}
+	if [ -e $treedir ];then
+		rm -rf $treedir
+	fi
+	mkdir $treedir
+	cp -pPR ${STAGING_DIR_TARGET}/* $treedir
+	if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then
+                cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+        fi
+        if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
+                cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
+        fi
 }
 
 EXTRA_OEMAKE += 'QEMU="${QEMU}"'
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs_20060801.bb b/emacs/emacs_20060801.bb
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs_22.3.bb b/emacs/emacs_22.3.bb
index da8de39..4eeff7b 100644
--- a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs_22.3.bb
+++ b/emacs/emacs_22.3.bb
@@ -1,5 +1,7 @@
 require emacs.inc
 
+PR="r1"
+
 EXTRA_OECONF = "--without-sound --without-x"
 
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz \
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs_cvs.bb b/emacs/emacs_cvs.bb
index 4a406d6..dca13b1 100644
--- a/home/embedded/oe/org.openembedded.dev/recipes/emacs/emacs_cvs.bb
+++ b/emacs/emacs_cvs.bb
@@ -6,6 +6,7 @@ SECTION = "editor"
 DEPENDS += "qemu-native"
 #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2
 # the build gets hung up on compiling certain .el files
+DEPENDS +="liblockfile"
 
 PV = "22.0.50+cvs${SRCDATE}" 
 PE = "1"
@@ -31,6 +32,8 @@ LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"
 
+#export LOGNAME:-$USERNAME = "${LOGNAME:-$USERNAME}"
+
 do_bootstrap() {
     cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
@@ -50,3 +53,7 @@ do_compile_prepend() {
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
     export QEMU="${QEMU}"
 }
+
+#do_install_prepend(){
+#    export LOGNAME:-$USERNAME = "${LOGNAME:-$USERNAME}"
+#}
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/files/nostdlib-unwind.patch b/emacs/files/nostdlib-unwind.patch
diff --git a/home/embedded/oe/org.openembedded.dev/recipes/emacs/files/use-qemu.patch b/emacs/files/use-qemu.patch