diff --git a/rrs/tools/rrs_distros.py b/rrs/tools/rrs_distros.py
index 7b5610b..ead79d0 100755
--- a/rrs/tools/rrs_distros.py
+++ b/rrs/tools/rrs_distros.py
@@ -36,6 +36,11 @@ update_repo(settings.LAYER_FETCH_DIR, 'poky', settings.POKY_REPO_URL,
 bitbakepath = os.path.join(fetchdir, 'bitbake')
 sys.path.insert(0, os.path.join(bitbakepath, 'lib'))
 
+# setup poky path
+pokypath = os.path.join(fetchdir, 'poky')
+sys.path.insert(0, os.path.join(pokypath, 'meta', 'lib'))
+
+
 from layerindex.models import Recipe, LayerBranch
 from rrs.models import RecipeDistro
 
diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py
index 72225b2..df71fd3 100755
--- a/rrs/tools/rrs_upstream_history.py
+++ b/rrs/tools/rrs_upstream_history.py
@@ -36,6 +36,10 @@ update_repo(settings.LAYER_FETCH_DIR, 'poky', settings.POKY_REPO_URL,
 bitbakepath = os.path.join(fetchdir, 'bitbake')
 sys.path.insert(0, os.path.join(bitbakepath, 'lib'))
 
+# setup poky path
+pokypath = os.path.join(fetchdir, 'poky')
+sys.path.insert(0, os.path.join(pokypath, 'meta', 'lib'))
+
 from layerindex.models import Recipe, LayerBranch
 from rrs.models import RecipeUpstream, RecipeUpstreamHistory