diff --git a/x11-libs/cd/cd-5.6.recipe b/x11-libs/cd/cd-5.6.recipe
index 8f8341133..2ad3e71ad 100644
--- a/x11-libs/cd/cd-5.6.recipe
+++ b/x11-libs/cd/cd-5.6.recipe
@@ -31,6 +31,7 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libim$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
 "
 
 BUILD_REQUIRES="
@@ -40,6 +41,7 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libim$secondaryArchSuffix
 	devel:liblua$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 "
 
@@ -48,6 +50,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:as$secondaryArchSuffix
+	cmd:pkg_config
 	cmd:which
 "
 
@@ -55,6 +58,8 @@ SOURCE_DIR="cd"
 PATCHES="cd-5.6.patchset"
 BUILD()
 {
+	export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
+
 	cd src
 	make
 
@@ -77,6 +82,30 @@ INSTALL()
 	packageEntries devel $developDir
 }
 
+TEST()
+{
+	export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
+
+	# Make sure the tests can link against the built libs
+	mkdir -p bin/Haiku11
+	ln -sf ../../lib/Haiku11 bin/Haiku11/lib
+
+	cd test
+
+	make -f ../tecmake.mak MF=metafile
+	../bin/Haiku11/metafile
+
+	# needs IUP
+	#make -f ../tecmake.mak MF=screencapture
+	#../bin/Haiku11/screencapture
+
+	# needs IUP
+	#pushd cdtest
+	#make -f ../../tecmake.mak
+	#popd
+	#../bin/Haiku11/cdtest
+}
+
 PROVIDES_devel="
 	cd${secondaryArchSuffix}_devel = $portVersion
 	devel:libcd$secondaryArchSuffix = $portVersion
diff --git a/x11-libs/cd/patches/cd-5.6.patchset b/x11-libs/cd/patches/cd-5.6.patchset
index 15520a189..724e16b3d 100644
--- a/x11-libs/cd/patches/cd-5.6.patchset
+++ b/x11-libs/cd/patches/cd-5.6.patchset
@@ -1,4 +1,4 @@
-From 684d70f2ff902351dfa75f81111dffeb7eb67eb3 Mon Sep 17 00:00:00 2001
+From 5b55dd52708486264bfb4e9eb46a6a215ed5e816 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Fri, 15 Nov 2013 21:59:25 +0100
 Subject: Import Haiku port sources.
@@ -17,6 +17,19 @@ index 4062cca..4887b2e 100644
  int cdBaseDriver(void);
  
  /***************/
+diff --git a/src/Makefile b/src/Makefile
+index b34037b..0c88757 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,7 +5,7 @@ else
+ endif
+ 
+ .PHONY: do_all cd_zlib cd_freetype cd_ftgl cd cdx11 cdgdk cd_pdflib cdpdf cdgl cdcontextplus cdcairo cdlua3 cdluapdf3 cdluagl3 cdlua5 cdluapdf5 cdluagl5 cdluacontextplus5 cdluacairo5 cdluaim5
+-do_all: cd_zlib cd_freetype cd_ftgl cd cd_pdflib cdpdf cdgl cdlua5 cdluapdf5 cdluagl5 cdluaim5
++do_all: cd_ftgl cd cd_pdflib cdpdf cdgl cdlua5 cdluapdf5 cdluagl5 cdluaim5
+ 
+ cd_zlib:
+ 	@$(TECMAKE_CMD) MF=cd_zlib
 diff --git a/src/config.mak b/src/config.mak
 index b3fe8e2..6eddc29 100644
 --- a/src/config.mak
@@ -688,7 +701,7 @@ index cc89349..fc982e0 100644
  }
  
 diff --git a/tecmake.mak b/tecmake.mak
-index e5f5efd..d52f725 100644
+index e5f5efd..0fd2536 100644
 --- a/tecmake.mak
 +++ b/tecmake.mak
 @@ -6,7 +6,7 @@
@@ -710,7 +723,19 @@ index e5f5efd..d52f725 100644
    ifeq ($(TEC_SYSNAME), SunOS)
      TEC_SYSARCH:=$(shell uname -p)
    endif
-@@ -505,6 +508,11 @@ else
+@@ -225,6 +228,11 @@ DLIBEXT := so
+ DLIBPRE := lib
+ APPEXT :=
+ 
++ifneq ($(findstring Haiku, $(TEC_UNAME)), )
++  # GTK and Motif are not available on Haiku
++  USE_HAIKU = Yes
++endif
++
+ ifneq ($(findstring Linux24, $(TEC_UNAME)), )
+   NO_GTK_DEFAULT = Yes
+ endif
+@@ -505,6 +513,11 @@ else
    endif
  endif
  
@@ -722,7 +747,7 @@ index e5f5efd..d52f725 100644
  ifneq ($(findstring Linux, $(TEC_UNAME)), )
    UNIX_LINUX = Yes
    ifdef BUILD_64
-@@ -526,6 +534,11 @@ ifneq ($(findstring Linux, $(TEC_UNAME)), )
+@@ -526,6 +539,11 @@ ifneq ($(findstring Linux, $(TEC_UNAME)), )
    endif
  endif
  
@@ -734,15 +759,15 @@ index e5f5efd..d52f725 100644
  ifneq ($(findstring IRIX, $(TEC_UNAME)), )
    UNIX_POSIX = Yes
    ifndef NO_LOCAL_LD
-@@ -852,6 +865,7 @@ endif
+@@ -852,6 +870,7 @@ endif
  ifdef USE_IUP
    IUP_SUFFIX ?=
    ifdef USE_IUP3
-+	ifndef USE_HAIKU
++    ifndef USE_HAIKU
      ifdef GTK_DEFAULT
        ifdef USE_MOTIF
          IUP_SUFFIX := mot
-@@ -869,6 +883,7 @@ ifdef USE_IUP
+@@ -869,6 +888,7 @@ ifdef USE_IUP
          endif
        endif
      endif
@@ -750,7 +775,7 @@ index e5f5efd..d52f725 100644
    else
      ifndef NO_OVERRIDE
        override USE_MOTIF = Yes
-@@ -902,17 +917,21 @@ endif
+@@ -902,17 +922,19 @@ endif
  
  ifdef USE_CD
    CD_SUFFIX ?=
@@ -765,9 +790,7 @@ index e5f5efd..d52f725 100644
 -    else
 -      ifdef USE_GTK
 -        CD_SUFFIX := gdk
-+  ifdef USE_HAIKU
-+    CD_SUFFIX := haiku
-+  else
++  ifndef USE_HAIKU
 +    ifndef NO_OVERRIDE
 +      override USE_X11 = Yes
 +    endif
@@ -783,7 +806,7 @@ index e5f5efd..d52f725 100644
        endif
      endif
    endif
-@@ -993,7 +1012,6 @@ endif
+@@ -993,7 +1015,6 @@ endif
  ifdef LINK_FREETYPE
    FREETYPE = freetype
    ifneq ($(findstring cygw, $(TEC_UNAME)), )
@@ -791,7 +814,19 @@ index e5f5efd..d52f725 100644
      FREETYPE = freetype-6
    endif
    
-@@ -1138,23 +1156,21 @@ ifdef USE_GTK
+@@ -1047,6 +1068,11 @@ ifdef USE_OPENGL
+   STDINCS += $(OPENGL_INC)
+ endif
+ 
++ifdef USE_HAIKU
++  PKGINCS += $(shell pkg-config --cflags libxml-2.0)
++  PKGLIBS += $(shell pkg-config --libs libxml-2.0)
++endif
++
+ ifdef USE_MOTIF
+   ifndef NO_OVERRIDE
+     override USE_X11 = Yes
+@@ -1138,23 +1164,21 @@ ifdef USE_GTK
        ifndef USE_GTK3
          STDINCS += $(GTK)/lib/x86_64-linux-gnu/gtk-2.0/include
        endif
@@ -830,7 +865,7 @@ index e5f5efd..d52f725 100644
        endif
      endif
      
-@@ -1180,7 +1196,9 @@ ifdef USE_X11
+@@ -1180,7 +1204,9 @@ ifdef USE_X11
    STDINCS += $(X11_INC)
  endif