diff --git a/meta-lsb/conf/layer.conf b/meta-lsb/conf/layer.conf
new file mode 100644
index 0000000000..1ef5c73a80
--- /dev/null
+++ b/meta-lsb/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}:${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
+
+BBFILE_COLLECTIONS += "lsb"
+BBFILE_PATTERN_lsb := "^${LAYERDIR}/"
+BBFILE_PRIORITY_lsb = "5"
+
diff --git a/meta-lsb/packages/images/poky-image-basic.bb b/meta-lsb/packages/images/poky-image-basic.bb
new file mode 100644
index 0000000000..5dae327019
--- /dev/null
+++ b/meta-lsb/packages/images/poky-image-basic.bb
@@ -0,0 +1,23 @@
+IMAGE_FEATURES += "apps-console-core "
+
+IMAGE_INSTALL = "\
+    ${POKY_BASE_INSTALL} \
+    task-poky-small \
+    task-poky-basic-libs \
+    task-poky-basic-libs-dbg \
+    task-poky-basic-libs-dev \
+    task-poky-basic-utils \
+    task-poky-basic-utils-dbg \
+    task-poky-basic-utils-dev \
+    task-poky-minimal-extras \
+    task-poky-minimal-extras-dbg \
+    task-poky-minimal-extras-dev \
+    task-poky-pkg-managment-opkg \
+    task-poky-pkg-managment-opkg-dbg \
+    task-poky-pkg-managment-opkg-dev \
+    task-poky-network-services \
+    task-poky-network-services-dbg \
+    task-poky-network-services-dev \
+    "
+
+inherit poky-image
diff --git a/meta-lsb/packages/images/poky-image-lsb.bb b/meta-lsb/packages/images/poky-image-lsb.bb
new file mode 100644
index 0000000000..af97894f80
--- /dev/null
+++ b/meta-lsb/packages/images/poky-image-lsb.bb
@@ -0,0 +1,13 @@
+IMAGE_FEATURES += "apps-console-core "
+
+IMAGE_INSTALL = "\
+    ${POKY_BASE_INSTALL} \
+    task-poky-small-utils \
+    task-poky-basic-libs \
+    task-poky-basic-utils \
+    task-poky-extended-libs \
+    task-poky-extended-utils \
+    task-poky-network-services \
+    "
+
+inherit poky-image
diff --git a/meta-lsb/packages/images/poky-image-small.bb b/meta-lsb/packages/images/poky-image-small.bb
new file mode 100644
index 0000000000..33248c3e5a
--- /dev/null
+++ b/meta-lsb/packages/images/poky-image-small.bb
@@ -0,0 +1,7 @@
+IMAGE_FEATURES += "apps-console-core "
+
+IMAGE_INSTALL = "\
+    ${POKY_BASE_INSTALL} \
+    task-poky-small-utils"
+
+inherit poky-image
diff --git a/meta-lsb/packages/tasks/task-poky-basic.bb b/meta-lsb/packages/tasks/task-poky-basic.bb
new file mode 100644
index 0000000000..4ee7e540a7
--- /dev/null
+++ b/meta-lsb/packages/tasks/task-poky-basic.bb
@@ -0,0 +1,149 @@
+#
+# Copyright (C) 2010 Intel Corporation
+#
+
+DESCRIPTION = "Create Small Image Tasks"
+PR = "r0"
+
+PACKAGES = "\
+    task-poky-small \
+    task-poky-basic-libs \
+    task-poky-basic-libs-dbg \
+    task-poky-basic-libs-dev \
+    task-poky-basic-utils \
+    task-poky-basic-utils-dbg \
+    task-poky-basic-utils-dev \
+    task-poky-minimal-extras \
+    task-poky-minimal-extras-dbg \
+    task-poky-minimal-extras-dev \
+    task-poky-pkg-managment-opkg \
+    task-poky-pkg-managment-opkg-dbg \
+    task-poky-pkg-managment-opkg-dev \
+    task-poky-network-services \
+    task-poky-network-services-dbg \
+    task-poky-network-services-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-poky-minimal-extras = "\
+     makedevs \
+     ncurses \
+     zlib \
+     udev \
+     udev-extraconf \
+     expat \
+     "
+
+RDEPENDS_task-poky-pkg-managment-opkg = "\
+     curl \
+     gnutls \
+     gpgme \
+     libgcrypt \
+     libgpg-error \
+     lzo \
+     opkg-config-base \
+     opkg-collateral \
+     opkg \
+     pth \
+     "
+
+RDEPENDS_task-poky-network-services = "\
+#    iproute \
+#    iputils \
+#    iptables \
+    nfs-utils \
+    "
+
+RDEPENDS_task-poky-shells = "\
+    bash \
+    mktemp \
+    
+
+RDEPENDS_task-poky-misc = "\
+    strace \
+    lsof \
+    elfutils \
+    usbutils \
+    zlib \
+    libusb \
+    libstdcxx \
+    bluez4 \
+    "
+
+RDEPENDS_task-poky-basic-libs = "\
+#    libssh2 \
+    dbus-glib \
+#    nfs-utils-lib \
+    "
+
+RDEPENDS_task-poky-basic-utils = "\
+#    openssh \
+    openssl \
+    pam \
+    sudo \
+    beecrypt \
+    curl \
+    elfutils \
+    neon \
+#    mktemp \
+    rpm \
+    bzip2 \
+#    crontabs \
+    dbus \
+    python-dbus \
+    e2fsprogs \
+    gdbm \
+    hal \
+    less \
+    popt \
+    portmap \
+    readline \
+#    cron \
+#    yaffs2 \
+    "
+
+RDEPENDS_task-poky-extended-libs = "\
+#    cracklib \
+    glib-2.0 \
+    libcap \
+    libevent \
+    "
+
+RDEPENDS_task-poky-extended-utils = "\
+#    acl \
+#    at \
+    attr \
+#    bc \
+    binutils \
+#    cpio \
+#    cracklib \
+#    logrotate \
+#    pax \
+#    shadow \
+    sqlite3 \
+#    syslog \
+#    ed \
+#    lsb \
+#    mailx \
+#    man \
+#    sendmail \
+    tcl \
+    "   
+
+RDEPENDS_task-poky-python = "\
+    gdbm \
+    perl \
+    zlib \
+    "
+
+RDEPENDS_task-poky-python = "\
+    expat \
+    gdbm \
+    gmp \
+    ncurses \
+    openssl \
+    python \
+    readline \
+    zlib \
+    "
diff --git a/meta-lsb/packages/tasks/task-poky-lsb.bb b/meta-lsb/packages/tasks/task-poky-lsb.bb
new file mode 100644
index 0000000000..034a5ca4c4
--- /dev/null
+++ b/meta-lsb/packages/tasks/task-poky-lsb.bb
@@ -0,0 +1,127 @@
+#
+# Copyright (C) 2010 Intel Corporation
+#
+
+DESCRIPTION = "Create Small Image Tasks"
+PR = "r0"
+
+PACKAGES = "\
+    task-poky-small \
+    task-poky-basic-libs \
+    task-poky-basic-libs-dbg \
+    task-poky-basic-libs-dev \
+    task-poky-basic-utils \
+    task-poky-basic-utils-dbg \
+    task-poky-basic-utils-dev \
+    task-poky-extended-libs \
+    task-poky-extended-libs-dbg \
+    task-poky-extended-libs-dev \
+    task-poky-extended-utils \
+    task-poky-extended-utils-dbg \
+    task-poky-extended-utils-dev \
+    task-poky-network-services \
+    task-poky-network-services-dbg \
+    task-poky-network-services-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-poky-network-services = "\
+#    iproute \
+#    iputils \
+#    iptables \
+    nfs-utils \
+    "
+
+RDEPENDS_task-poky-shells = "\
+    bash \
+    mktemp \
+    
+
+RDEPENDS_task-poky-misc = "\
+    strace \
+    lsof \
+    elfutils \
+    usbutils \
+    zlib \
+    libusb \
+    libstdcxx \
+    bluez4 \
+    "
+
+RDEPENDS_task-poky-basic-libs = "\
+#    libssh2 \
+    dbus-glib \
+#    nfs-utils-lib \
+    "
+
+RDEPENDS_task-poky-basic-utils = "\
+#    openssh \
+    openssl \
+    pam \
+    sudo \
+    beecrypt \
+    curl \
+    elfutils \
+    neon \
+#    mktemp \
+    rpm \
+    bzip2 \
+#    crontabs \
+    dbus \
+    python-dbus \
+    e2fsprogs \
+    gdbm \
+    hal \
+    less \
+    popt \
+    portmap \
+    readline \
+#    cron \
+#    yaffs2 \
+    "
+
+RDEPENDS_task-poky-extended-libs = "\
+#    cracklib \
+    glib-2.0 \
+    libcap \
+    libevent \
+    "
+
+RDEPENDS_task-poky-extended-utils = "\
+#    acl \
+#    at \
+    attr \
+#    bc \
+    binutils \
+#    cpio \
+#    cracklib \
+#    logrotate \
+#    pax \
+#    shadow \
+    sqlite3 \
+#    syslog \
+#    ed \
+#    lsb \
+#    mailx \
+#    man \
+#    sendmail \
+    tcl \
+    "   
+
+RDEPENDS_task-poky-python = "\
+    gdbm \
+    perl \
+    zlib \
+    "
+
+RDEPENDS_task-poky-python = "\
+    expat \
+    gdbm \
+    gmp \
+    ncurses \
+    openssl \
+    python \
+    readline \
+    zlib \
+    "
diff --git a/meta-lsb/packages/tasks/task-poky-small.bb b/meta-lsb/packages/tasks/task-poky-small.bb
new file mode 100644
index 0000000000..b966dc72cc
--- /dev/null
+++ b/meta-lsb/packages/tasks/task-poky-small.bb
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2010 Intel Corporation
+#
+
+DESCRIPTION = "Create Small Image Tasks"
+PR = "r0"
+
+PACKAGES = "\
+    task-poky-small-utils \
+    task-poky-small-utils-dbg \
+    task-poky-small-utils-dev \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_task-poky-small-utils = "\
+    bash \
+    coreutils \
+    file \
+    findutils \
+    ncurses \
+    psmisc \
+    sed \
+    time \
+    zlib \
+    udev \
+    udev-extraconf \
+#    gawk \
+#    grep \
+#    gzip \
+#    makedev \
+#    mktemp \
+#    net-tools \
+#    procps \
+#    passwd \
+#    tar \
+#    util-linux \
+    "