diff --git a/gforth/Makefile b/gforth/Makefile
index d2b8f62..df7a655 100644
--- a/gforth/Makefile
+++ b/gforth/Makefile
@@ -16,20 +16,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gforth
-PKG_VERSION:=0.7.0-20100725
-PKG_RELEASE:=9
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mosquito.dyndns.tv/~spock/
-PKG_MD5SUM:=f030bdfe42a9be32889d5b4c8cb37856
+PKG_SNAPSHOT_DATE=20100725
+PKG_VERSION=0.7.0-$(PKG_SNAPSHOT_DATE)
+PKG_RELEASE:=10
 
 PKG_BUILD_DEPENDS:= gforth/host libltdl/host
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=libtool
 
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=\
+	http://user.cs.tu-berlin.de/~dvdkhlng/ \
+	http://mosquito.dyndns.tv/~spock/
+PKG_MD5SUM:=f030bdfe42a9be32889d5b4c8cb37856
 
-# for now: override download and use local gforth sources
+# Alternate download #1 via CVS: this doesn't work, as CVS is missing the
+# kernel.fi images needed for boot-strapping :(
+# PKG_SOURCE_PROTO:=cvs
+# PKG_SOURCE_VERSION="-D$(PKG_SNAPSHOT_DATE) 23:59"
+# PKG_SOURCE_URL=:pserver:anonymous@c1.complang.tuwien.ac.at:/nfs/unsafe/cvs-repository/src-master
+# PKG_SOURCE_SUBDIR:=gforth
+# PKG_SOURCE:=gforth-$(PKG_SNAPSHOT_DATE).tar.gz
+
+# alternate download #2: use local sources
 # remove the prepare.stamp if updating tgz
 # define Build/Prepare
 # 	mkdir -p $(PKG_BUILD_DIR)
@@ -40,6 +49,9 @@ include $(INCLUDE_DIR)/package.mk
 # 	(cd $(HOST_BUILD_DIR)/.. && tar -xzvf -) < ~/forth/gforth/$(PKG_SOURCE)
 # endef
 
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
 define Package/gforth
   SECTION:=lang
   CATEGORY:=Languages