diff --git a/conf/local.conf b/conf/local.conf
index a641121..69ac50e 100644
--- a/conf/local.conf
+++ b/conf/local.conf
@@ -19,7 +19,7 @@ IMAGE_FSTYPES += "tar.bz2"
  PARALLEL_MAKE     = "-j2"
  BB_NUMBER_THREADS = "2"

-DISTRO   = "angstrom-2010.x"
+DISTRO   = "shr"

  # Set terminal types by default it expects gnome-terminal
  # but we chose xterm
diff --git a/oebb.sh b/oebb.sh
index 43697ab..49afaa8 100755
--- a/oebb.sh
+++ b/oebb.sh
@@ -66,7 +66,7 @@ else
       
#--------------------------------------------------------------------------
      # Specify distribution information
       
#--------------------------------------------------------------------------
-    DISTRO="angstrom-2010.x"
+    DISTRO="shr"
      DISTRO_DIRNAME=`echo $DISTRO | sed s#[.-]#_#g`

      echo "export SCRIPTS_BASE_VERSION=${BASE_VERSION}" > ${OE_ENV_FILE}
@@ -253,7 +253,6 @@ BBFILES = ""
  # Add your overlay location to BBLAYERS
  # Make sure to have a conf/layers.conf in there
  BBLAYERS = " \\
-  \${TOPDIR}/sources/meta-angstrom \\
    \${TOPDIR}/sources/meta-openembedded/meta-oe \\
    \${TOPDIR}/sources/meta-openembedded/meta-efl \\
    \${TOPDIR}/sources/meta-openembedded/meta-gpe \\
@@ -266,6 +265,8 @@ BBLAYERS = " \\
    \${TOPDIR}/sources/meta-smartphone/meta-openmoko \\
    \${TOPDIR}/sources/meta-smartphone/meta-palm \\
    \${TOPDIR}/sources/meta-smartphone/meta-zaurus \\
+  \${TOPDIR}/sources/meta-smartphone/meta-shr \\
+  \${TOPDIR}/sources/meta-smartphone/meta-fso \\
    \${TOPDIR}/sources/meta-intel/meta-sugarbay \\
    \${TOPDIR}/sources/meta-intel/meta-crownbay \\
    \${TOPDIR}/sources/meta-intel/meta-emenlow \\
diff --git a/sources/layers.txt b/sources/layers.txt
index 45c68d2..0d96a70 100644
--- a/sources/layers.txt
+++ b/sources/layers.txt
@@ -1,11 +1,10 @@
  # Name,repo-uri,branch,rev
  bitbake,git://git.openembedded.net/bitbake,master,HEAD
-meta-angstrom,git://git.angstrom-distribution.org/meta-angstrom,master,HEAD
-meta-openembedded,git://git.openembedded.net/meta-openembedded,master,HEAD
+meta-openembedded,git://git.openembedded.net/meta-openembedded-contrib,shr,HEAD
   
meta-texasinstruments,git://git.angstrom-distribution.org/meta-texasinstruments,master,HEAD
  meta-efikamx,git://github.com/kraj/meta-efikamx.git,master,HEAD
  meta-nslu2,git://github.com/kraj/meta-nslu2.git,master,HEAD
   
meta-smartphone,http://git.shr-project.org/repo/meta-smartphone.git,master,HEAD
  meta-intel,git://git.yoctoproject.org/meta-intel,master,HEAD