diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 79b962a..b6383ac 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -66,6 +66,13 @@ distutils_do_install() {
             mv -f ${D}${datadir}/share/* ${D}${datadir}/
         fi
 
+        #
+        # FIXME: Bandaid against wrong libdir computation
+        #
+        if test -e ${D}${datadir}/lib; then
+            cp -r -f ${D}${datadir}/lib/* ${D}${libdir}/
+            rm -rf ${D}${datadir}/lib/
+        fi
         # These are generated files, on really slow systems the storage/speed trade off
         # might be worth it, but in general it isn't 
         find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm {} \;