diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc
index de3cfd1309..37e791e4bb 100644
--- a/recipes-smalltalk/smalltalk/smalltalk.inc
+++ b/recipes-smalltalk/smalltalk/smalltalk.inc
@@ -2,19 +2,37 @@ DESCRIPTION = "GNU Smalltalk."
 HOMEPAGE = "http://smalltalk.gnu.org/"
 LICENSE = "GPLv2+"
 
-INC_PR = "2"
+INC_PR = "7"
 
 DEPENDS = "smalltalk-native gnutls readline"
 DEPENDS_virtclass-native = "gnutls-native"
 
-EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl --with-tcl=/bin/false --with-tk=/bin/false"
-PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite \
-	${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples "
+EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl --with-tcl=/bin/false --with-tk=/bin/false --without-emacs gst_cv_libc_dlopen_works=hacked"
+PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-iconv ${PN}-i18n ${PN}-gdbm ${PN}-sdl \
+	${PN}-sqlite ${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples \
+	${PN}-zlib"
+
+# skip dev-so for plugins
+INSANE_SKIP_${PN}-digest = "dev-so"
+INSANE_SKIP_${PN}-expat = "dev-so"
+INSANE_SKIP_${PN}-iconv = "dev-so"
+INSANE_SKIP_${PN}-i18n = "dev-so"
+INSANE_SKIP_${PN}-gdbm = "dev-so"
+INSANE_SKIP_${PN}-sdl = "dev-so"
+INSANE_SKIP_${PN}-sqlite = "dev-so"
+INSANE_SKIP_${PN}-zlib = "dev-so"
+
+# gst-tool and such
+INSANE_SKIP_${PN} = "useless-rpaths"
 
 FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so \
 	${datadir}/smalltalk/Digest.star"
 FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so \
 	${datadir}/smalltalk/XML-Expat.star"
+FILES_${PN}-iconv = "${libdir}/smalltalk/iconv*.so \
+	${datadir}/smalltalk/I18N.star ${datadir}/smalltalk/Iconv.star"
+FILES_${PN}-i18n = "${libdir}/smalltalk/i18n*.so \
+	${datadir}/smalltalk/I18N.star ${datadir}/smalltalk/I18N.star"
 FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so"
 FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so"
 FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so \
@@ -26,6 +44,8 @@ FILES_${PN}-static += "${libdir}/smalltalk/lib*.a"
 FILES_${PN}-seaside = "${datadir}/smalltalk/Seaside*.star"
 FILES_${PN}-magritte = "${datadir}/smalltalk/Magritte.star"
 FILES_${PN}-magritte-seaside = "${datadir}/smalltalk/Magritte-Seaside.star"
+FILES_${PN}-zlib = "${libdir}/smalltalk/zlib*.so \
+	${datadir}/smalltalk/ZLib.star"
 
 FILES_${PN}-examples = "${datadir}/smalltalk/examples/* ${datadir}/smalltalk/unsupported/*"
 
@@ -37,13 +57,11 @@ do_configure() {
 	sed -i -e 's/^GST_PACKAGE = .*$/GST_PACKAGE = XZIP="$(XZIP)" gst-package $(GST_OPTS)/' ${S}/Makefile.am
 	sed -i -e 's/"$(abs_top_builddir)\/gst$(EXEEXT)"/gst/' ${S}/Makefile.am
 	autotools_do_configure
-	rm -f ${S}/libc.la
 }
 
 do_configure_virtclass-native() {
 	autotools_do_configure
 	sed -i -e 's/^module_DATA.*$//' ${S}/Makefile
-	rm -f ${S}/libc.la
 }
 
 do_install_append() {