diff --git a/recipes-smalltalk/smalltalk/smalltalk.inc b/recipes-smalltalk/smalltalk/smalltalk.inc
new file mode 100644
index 0000000000..1cfca43e02
--- /dev/null
+++ b/recipes-smalltalk/smalltalk/smalltalk.inc
@@ -0,0 +1,54 @@
+DESCRIPTION = "GNU Smalltalk."
+HOMEPAGE = "http://smalltalk.gnu.org/"
+LICENSE = "GPLv2+"
+
+INC_PR = "2"
+
+DEPENDS = "smalltalk-native gnutls readline"
+DEPENDS_virtclass-native = "gnutls-native"
+
+EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl"
+PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite \
+	${PN}-seaside ${PN}-magritte ${PN}-magritte-seaside ${PN}-examples "
+
+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}-gdbm = "${libdir}/smalltalk/gdbm*.so"
+FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so"
+FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so \
+	${datadir}/smalltalk/DBD-SQLite.star"
+FILES_${PN}-dbg += "${libdir}/smalltalk/.debug ${libexecdir}/smalltalk/.debug"
+FILES_${PN}-dev += "${libdir}/smalltalk/*.la"
+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}-examples = "${datadir}/smalltalk/examples/* ${datadir}/smalltalk/unsupported/*"
+
+
+inherit autotools
+
+do_configure() {
+	sed -i -e 's/^GST = .*$/GST = gst --no-user-files $(GST_OPTS)/' ${S}/Makefile.am
+	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() {
+	find ${D}${libdir}/smalltalk -name "*.la" -delete
+}
+
+BBCLASSEXTEND = "native"
+
diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb
new file mode 100644
index 0000000000..ba0b53d8f4
--- /dev/null
+++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.99.bb
@@ -0,0 +1,16 @@
+require ${PN}.inc
+PR = "r11.${INC_PR}"
+
+# TODO: Upgrade, package the docs, split the packages, create gst class
+
+SRC_URI = " \
+  http://www.secretlabs.de/gnu-smalltalk/smalltalk-3.2.4.99.tar.gz  \
+  file://no-doc.patch \
+"
+
+SRC_URI[md5sum] = "ab76000aeb212fa556937f45c2315c3f"
+SRC_URI[sha256sum] = "4fe3163ac5530272644c16ae8e8e7822cf7712981e5916e24fec871f380f0191"
+
+SRCREV = "c17f4a0f757f398dad3bd90edbf8afdb96c0e995"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
diff --git a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb
index e925904168..17d82656a6 100644
--- a/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb
+++ b/recipes-smalltalk/smalltalk/smalltalk_3.2.4.bb
@@ -1,10 +1,5 @@
-DESCRIPTION = "GNU Smalltalk."
-HOMEPAGE = "http://smalltalk.gnu.org/"
-LICENSE = "GPLv2+"
-PR = "r10"
-
-DEPENDS = "smalltalk-native gnutls"
-DEPENDS_virtclass-native = "gnutls-native"
+require ${PN}.inc
+PR = "r11.${INC_PR}"
 
 SRC_URI = " \
   ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.2.4.tar.gz \
@@ -20,33 +15,4 @@ SRC_URI[sha256sum] = "901cc7090a1fa44bc60900a970d207de4aa3bdfdce72bea55114e243bc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-EXTRA_OECONF = "--disable-static --disable-gtk --without-x --without-opengl"
-PACKAGES =+ "${PN}-digest ${PN}-expat ${PN}-gdbm ${PN}-sdl ${PN}-sqlite"
-
-FILES_${PN}-digest = "${libdir}/smalltalk/digest*.so"
-FILES_${PN}-expat = "${libdir}/smalltalk/expat*.so"
-FILES_${PN}-gdbm = "${libdir}/smalltalk/gdbm*.so"
-FILES_${PN}-sdl = "${libdir}/smalltalk/sdl*.so"
-FILES_${PN}-sqlite = "${libdir}/smalltalk/dbd-sqlite*.so"
-FILES_${PN}-dbg += "${libdir}/smalltalk/.debug ${libexecdir}/smalltalk/.debug"
-FILES_${PN}-dev += "${libdir}/smalltalk/*.la"
-FILES_${PN}-static += "${libdir}/smalltalk/lib*.a"
-
-inherit autotools
-
-do_configure() {
-	sed -i -e 's/^GST = .*$/GST = gst --no-user-files $(GST_OPTS)/' ${S}/Makefile.am
-	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
-}
-
-BBCLASSEXTEND = "native"