diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe
new file mode 100644
index 000000000..342f7fcd7
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5_hg.recipe
@@ -0,0 +1,99 @@
+SUMMARY="XEmacs editor"
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://xemacs.org/"
+SRC_URI="hg+https://bitbucket.org/mmu_man/xemacs#24b993054953"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1998-2000 Hrvoje Niksic
+	2000-2001 Michael Sperber
+	2001 Ben Wing
+	2001 Didier Verna
+	2004 Stephen Turnbull
+	2005-2006 Aidan Kehoe"
+# TODO: FIXME:
+#Bootstrapping from temacs...
+#Warning: 
+#        XEmacs was unable to determine a good value for the user's $HOME
+#        directory, and will be using the value:
+#                /
+#        This is probably incorrect.
+
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+#POLICY WARNING: no matching provides "cmd:b2m" for "bin/b2m"
+#POLICY WARNING: no matching provides "cmd:ctags" for "bin/ctags"
+#POLICY WARNING: no matching provides "cmd:ellcc" for "bin/ellcc"
+#POLICY WARNING: no matching provides "cmd:etags" for "bin/etags"
+#POLICY WARNING: no matching provides "cmd:gnuattach" for "bin/gnuattach"
+#POLICY WARNING: no matching provides "cmd:gnuclient" for "bin/gnuclient"
+#POLICY WARNING: no matching provides "cmd:gnudoit" for "bin/gnudoit"
+#POLICY WARNING: no matching provides "cmd:ootags" for "bin/ootags"
+#POLICY WARNING: no matching provides "cmd:xemacs_21.5_b34" for "bin/xemacs-21.5-b34"
+#POLICY WARNING: no matching provides "cmd:xemacs_script" for "bin/xemacs-script
+PROVIDES="
+	xemacs$secondaryArchSuffix = $portVersion
+	app:xemacs = $portVersion
+	cmd:xemacs = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
+#	lib:libxpm$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+#	devel:libtiff$secondaryArchSuffix
+#	devel:libxpm$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:tar
+	cmd:which
+	cmd:makeinfo
+	"
+
+# TODO: fix lispdir to not use $HOME
+BUILD()
+{
+	export DISABLEASLR=1
+	autoconf
+	export HOME=/boot/home
+	runConfigure ./configure \
+		--with-tty=yes --with-pop --with-x11=no --with-ipv6-cname=no \
+		--with-mule --with-wnn=no \
+		-with-beos=yes \
+		--with-toolbars=yes \
+		--with-scrollbars=no \
+		--with-menubars=no \
+		--with-dialogs=no \
+		--with-widgets=no \
+		--with-dragndrop=yes \
+		--with-system-malloc --disable-mc-alloc --with-mc-alloc=no \
+		--with-postgresql=no \
+		--disable-kkcc \
+		--with-png
+	make clean
+	make
+}
+
+INSTALL()
+{
+	export DISABLEASLR=1
+	make install
+	addattr SYS:ENV DISABLEASLR=1 $binDir/xemacs-21*
+	addAppDeskbarSymlink $binDir/xemacs XEmacs
+}
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
index 5df1e235d..73951280e 100644
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -47,4 +47,5 @@ BUILD()
 INSTALL()
 {
 	make install
+	fixPkgconfig
 }
diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe
index f3ea35ab7..511d9c711 100644
--- a/haiku-apps/behappy/behappy-1.06e_git.recipe
+++ b/haiku-apps/behappy/behappy-1.06e_git.recipe
@@ -40,5 +40,6 @@ INSTALL()
 {
 	cd trunk
 	make install BUILDHOME=/system/develop
+	addAppDeskbarSymlink $appsDir/BeHappy/BeHappy
 }
 
diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe
index 262bf426b..d3848bf41 100644
--- a/x11-libs/libxau/libxau-1.0.5.recipe
+++ b/x11-libs/libxau/libxau-1.0.5.recipe
@@ -1,22 +1,58 @@
+SUMMARY="libxau" 
 DESCRIPTION="libxau" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz"
 CHECKSUM_MD5="1a421d9376f43596fe068ce209a70b84"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.23
-        x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1988, 1993, 1994, 1998  The Open Group"
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libxau$secondaryArchSuffix = $portVersion
+	lib:libxau$secondaryArchSuffix = $portVersion
+	lib:libXau$secondaryArchSuffix = $portVersion
+	devel:libxau$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	xproto$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	devel:xproto$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+SOURCE_DIR="libXau-$portVersion"
+
+PATCHES="libxau-1.0.5.patch"
+
 BUILD()
 {
-	cd libXau-1.0.5
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libXau-1.0.5
 	make install
+	prepareInstalledDevelLibs libXau
+	fixPkgconfig
 }
diff --git a/x11-libs/libxau/patches/libxau-1.0.5.patch b/x11-libs/libxau/patches/libxau-1.0.5.patch
index b131ea47e..7779a6f82 100644
--- a/x11-libs/libxau/patches/libxau-1.0.5.patch
+++ b/x11-libs/libxau/patches/libxau-1.0.5.patch
@@ -1,7 +1,17 @@
-diff -Naur libXau-1.0.5/configure.ac libXau-1.0.5-haiku/configure.ac
---- libXau-1.0.5/configure.ac	2009-08-28 04:34:23.023855104 +0000
-+++ libXau-1.0.5-haiku/configure.ac	2010-04-26 23:21:53.573308928 +0000
-@@ -58,6 +58,9 @@
+diff --git a/configure.ac b/configure.ac
+index c63adcb..0d981c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ 
+ # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+ m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+@@ -58,6 +58,9 @@ if test "x$xthreads" = "xyes" ; then
      if test "x$mtsafe" = "x" ; then
  	AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes])
      fi
diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
index 190bd056d..3127598b5 100644
--- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
@@ -36,6 +36,10 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="xcb-proto-$portVersion"
 
+GLOBAL_WRITABLE_FILES="
+	non-packaged/lib/python2.6/site-packages directory keep-old
+	"
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -46,5 +50,6 @@ BUILD()
 
 INSTALL()
 {
-	make install
+	make install DESTDIR=/
+	fixPkgconfig
 }