diff -Naur --exclude CVS --exclude .git ltib.orig/config/userspace/packages.lkc ltib.new/config/userspace/packages.lkc
--- config/userspace/packages.lkc	2009-07-17 12:46:18.000000000 -0300
+++ config/userspace/packages.lkc	2009-08-13 16:26:37.000000000 -0300
@@ -1581,6 +1581,13 @@
       file format. It lets you poke around in the various different
       sections of an ELF file, check out the symbols, etc.
 
+config PKG_LIBFAKEKEY
+     select PKG_LIBXTST
+     bool "libfakekey"
+     help
+       libfakekey is a simple library for converting UTF-8 characters into
+       'fake' X key-presses.
+
 config PKG_LIBNET
     bool "libnet"
     help
@@ -3358,6 +3365,13 @@
     help
       X.Org X11 libXfixes runtime library
 
+config PKG_LIBXFT
+    depends CAP_HAS_MMU
+    select PKG_FONTCONFIG
+    bool "libXft"
+    help
+      X.Org X11 libXft runtime library
+
 config PKG_LIBXCURSOR
     depends CAP_HAS_MMU
     select PKG_LIBXI
@@ -3368,6 +3382,12 @@
     help
       X.Org X11 libXfixes runtime library
 
+config PKG_LIBXTST
+    depends CAP_HAS_MMU
+    bool "libXtst"
+    help
+      X.Org X11 libXtst runtime library
+
 config PKG_LIBXXF86DGA
     depends CAP_HAS_MMU
     bool "libXxf86dga"
@@ -3411,8 +3431,71 @@
     help
       Terminal emulator for the X Window System
 
+endmenu
+
+if PKG_XORG_SERVER
+menu "Window Manager"
+
+config PKG_LIBMATCHBOX
+    depends CAP_HAS_MMU
+    select PKG_LIBXFT
+    select PKG_LIBPNG
+    select PKG_LIBJPEG
+    bool "libmatchbox"
+    help
+      A small basic library that provides a large amount of shared functionality
+      to the various matchbox librarys. Provides image processing, font abstraction,
+       a tray app toolkit and more.
+
+config PKG_MATCHBOX_COMMON
+    depends CAP_HAS_MMU
+    select PKG_LIBMATCHBOX
+    bool "matchbox-common"
+    help
+      A package containing shared icons and configuration data of matchbox.
+
+config PKG_MATCHBOX_DESKTOP
+    depends CAP_HAS_MMU
+    select PKG_LIBMATCHBOX
+    bool "matchbox-desktop"
+    help
+      A PDA style application launcher or 'item browser'. Its functionality can
+      be extended by means of dynamically loadable plugins.
+
+config PKG_MATCHBOX_KEYBOARD
+    depends CAP_HAS_MMU
+    select PKG_LIBMATCHBOX
+    select PKG_LIBFAKEKEY
+    bool "matchbox-keyboard"
+    help
+      A Software based 'virtual' keyboard.
+
+config PKG_MATCHBOX_PANEL
+    depends CAP_HAS_MMU
+    select PKG_LIBMATCHBOX
+    select PKG_LIBFAKEKEY
+    bool "matchbox-panel"
+    help
+      A flexible always present 'window bar' for holding application launchers and 
+      small 'applet' style applications. A number of applets are included in the module.
+
+config PKG_MATCHBOX_WINDOW_MANAGER
+    depends CAP_HAS_MMU
+    select PKG_LIBMATCHBOX
+    bool "matchbox-window-manager"
+    help
+      A pretty much unique X window manager with a classic PDA management policy. The 
+      most developed and mature Matchbox application.
+
+config PKG_MB_APPLET_INPUT_MANAGER
+    depends CAP_HAS_MMU
+    select PKG_LIBMATCHBOX
+    bool "mb-applet-input-manager"
+    help
+      Input manager for the Matchbox Desktop.
 
 endmenu
+endif
 
 endmenu
 
diff -Naur --exclude CVS --exclude .git ltib.orig/config/userspace/pkg_map ltib.new/config/userspace/pkg_map
--- config/userspace/pkg_map	2009-07-17 12:46:18.000000000 -0300
+++ config/userspace/pkg_map	2009-08-13 16:26:50.000000000 -0300
@@ -371,11 +371,23 @@
 PKG_LIBXI                        = libXi
 PKG_LIBXFIXES                    = libXfixes
 PKG_LIBXCURSOR                   = libXcursor
+PKG_LIBXFT                       = libXft
+PKG_LIBXTST                      = libXtst
+PKG_LIBFAKEKEY                   = libfakekey
 
 # dillo2 web browser
 PKG_FLTK2                        = fltk2
 PKG_DILLO2                       = dillo2
 
+# matchbox
+PKG_LIBMATCHBOX                  = libmatchbox
+PKG_MATCHBOX_COMMON              = matchbox-common
+PKG_MATCHBOX_KEYBOARD            = matchbox-keyboard
+PKG_MATCHBOX_DESKTOP             = matchbox-desktop
+PKG_MATCHBOX_PANEL               = matchbox-panel
+PKG_MATCHBOX_WINDOW_MANAGER      = matchbox-window-manager
+PKG_MB_APPLET_INPUT_MANAGER      = mb-applet-input-manager
+
 # leave these as the last 3 packages in the build order
 PKG_SYSCONFIG                    = sysconfig
 PKG_MERGE                        = merge
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/libfakekey/libfakekey.spec ltib.new/dist/lfs-5.1/libfakekey/libfakekey.spec
--- dist/lfs-5.1/libfakekey/libfakekey.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/libfakekey/libfakekey.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,39 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : Library for converting characters to X key-presses
+Name            : libfakekey
+Version         : 0.1
+Release         : 1
+License         : LGPLv2+
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System Environment/Libraries
+URL             : http://projects.o-hand.com/matchbox/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+libfakekey is a simple library for converting UTF-8 characters into
+\'fake\' X key-presses. 
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/libmatchbox/libmatchbox.spec ltib.new/dist/lfs-5.1/libmatchbox/libmatchbox.spec
--- dist/lfs-5.1/libmatchbox/libmatchbox.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/libmatchbox/libmatchbox.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : LibMatchBox
+Name            : libmatchbox
+Version         : 1.9
+Release         : 1
+License         : LGPL
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : Development/Libraries
+URL             : http://matchbox-project.org/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+A small basic library that provides a large amount of shared functionality to the various matchbox librarys. Provides image processing, font abstraction, a tray app toolkit and more. It is licensed under LGPL.
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/libXft/libXft.spec ltib.new/dist/lfs-5.1/libXft/libXft.spec
--- dist/lfs-5.1/libXft/libXft.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/libXft/libXft.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : X.Org X11 libXft runtime library
+Name            : libXft
+Version         : 2.1.13
+Release         : 1
+License         : MIT
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System Environment/Libraries
+URL             : http://www.x.org/
+Source          : %{name}-%{version}.tar.bz2
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+X.Org X11 libXft runtime library
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/libXtst/libXtst.spec ltib.new/dist/lfs-5.1/libXtst/libXtst.spec
--- dist/lfs-5.1/libXtst/libXtst.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/libXtst/libXtst.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : X.Org X11 libXtst runtime library
+Name            : libXtst
+Version         : 1.0.3
+Release         : 1
+License         : MIT
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System Environment/Libraries
+URL             : http://www.x.org/
+Source          : %{name}-%{version}.tar.bz2
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+X.Org X11 libXtst runtime library
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build} --enable-malloc0returnsnull
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/matchbox-common/matchbox-common.spec ltib.new/dist/lfs-5.1/matchbox-common/matchbox-common.spec
--- dist/lfs-5.1/matchbox-common/matchbox-common.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/matchbox-common/matchbox-common.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : MatchBox Common
+Name            : matchbox-common
+Version         : 0.9.1
+Release         : 1
+License         : GPL
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System/Libraries
+URL             : http://matchbox-project.org/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+A package containing shared icons and configuration data.
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/matchbox-desktop/matchbox-desktop.spec ltib.new/dist/lfs-5.1/matchbox-desktop/matchbox-desktop.spec
--- dist/lfs-5.1/matchbox-desktop/matchbox-desktop.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/matchbox-desktop/matchbox-desktop.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : MatchBox Desktop
+Name            : matchbox-desktop
+Version         : 0.9.1
+Release         : 1
+License         : GNU
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System/Libraries
+URL             : http://matchbox-project.org/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+A PDA style application launcher or 'item browser'. Its functionality can be extended by means of dynamically loadable plugins. 
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/matchbox-keyboard/matchbox-keyboard.spec ltib.new/dist/lfs-5.1/matchbox-keyboard/matchbox-keyboard.spec
--- dist/lfs-5.1/matchbox-keyboard/matchbox-keyboard.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/matchbox-keyboard/matchbox-keyboard.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : MatchBox Keyboard 
+Name            : matchbox-keyboard
+Version         : 0.1
+Release         : 1
+License         : GPL
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System/Libraries
+URL             : http://matchbox-project.org/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+A Software based 'virtual' keyboard.
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/matchbox-panel/matchbox-panel.spec ltib.new/dist/lfs-5.1/matchbox-panel/matchbox-panel.spec
--- dist/lfs-5.1/matchbox-panel/matchbox-panel.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/matchbox-panel/matchbox-panel.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : MatchBox Panel
+Name            : matchbox-panel
+Version         : 0.9.1
+Release         : 1
+License         : GPL
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System/Libraries
+URL             : http://matchbox-project.org/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+A flexible always present 'window bar' for holding application launchers and small 'applet' style applications. A number of applets are included in the module. 
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/matchbox-window-manager/matchbox-window-manager.spec ltib.new/dist/lfs-5.1/matchbox-window-manager/matchbox-window-manager.spec
--- dist/lfs-5.1/matchbox-window-manager/matchbox-window-manager.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/matchbox-window-manager/matchbox-window-manager.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : MatchBox Window Manager
+Name            : matchbox-window-manager
+Version         : 1.1
+Release         : 1
+License         : GPL
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : System/Libraries
+URL             : http://matchbox-project.org/
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+A pretty much unique X window manager with a classic PDA management policy. The most developed and mature Matchbox application.
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+
diff -Naur --exclude CVS --exclude .git ltib.orig/dist/lfs-5.1/mb-applet-input-manager/mb-applet-input-manager.spec ltib.new/dist/lfs-5.1/mb-applet-input-manager/mb-applet-input-manager.spec
--- dist/lfs-5.1/mb-applet-input-manager/mb-applet-input-manager.spec	1969-12-31 21:00:00.000000000 -0300
+++ dist/lfs-5.1/mb-applet-input-manager/mb-applet-input-manager.spec	2009-08-13 16:25:52.000000000 -0300
@@ -0,0 +1,38 @@
+%define pfx /opt/freescale/rootfs/%{_target_cpu}
+
+Summary         : Input manager for the Matchbox Desktop
+Name            : mb-applet-input-manager
+Version         : 0.6
+Release         : 1
+License         : X11
+Vendor          : Maxtrack
+Packager        : Alan Carvalho<address@hidden>, Hamilton Vera<address@hidden>, Rogerio de Souza<address@hidden>
+Group           : Graphical desktop/Other
+URL             : GPLv2+
+Source          : %{name}-%{version}.tar.gz
+BuildRoot       : %{_tmppath}/%{name}
+Prefix          : %{pfx}
+
+%Description
+Input manager for the Matchbox Desktop.
+
+%Prep
+%setup
+
+%Build
+./configure --prefix=%{_prefix} --host=$CFGHOST --build=%{_build}
+make
+
+%Install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/%{pfx}
+find $RPM_BUILD_ROOT/%{pfx}/%{_prefix}/lib/ -name "*.la" | xargs rm -f
+
+
+%Clean
+rm -rf $RPM_BUILD_ROOT
+
+%Files
+%defattr(-,root,root)
+%{pfx}/*
+