diff --git a/download/gf-download.html b/download/gf-download.html
index a71c088a7..869416480 100644
--- a/download/gf-download.html
+++ b/download/gf-download.html
@@ -8,23 +8,23 @@
 
 <p>
 
-GF 2.0
+GF 2.1
 <p>
-August 10, 2004
+November 8, 2004
 </center>
 
 
 
 <h3>Linux</h3>
 
-<a href="GF-2.0-2.i586.rpm"><tt>GF-2.0-2.i586.rpm</tt></a>: 
+<a href="GF-2.1-1.i586.rpm"><tt>GF-2.1-2.i586.rpm</tt></a>: 
 RPM package for RedHat and Mandrake
 <br>
 To install, use <tt>rpm -i</tt>
 
 <p>
 
-<a href="GF-2.0-i686-pc-linux-gnu.tgz"><tt>GF-2.0-i686-pc-linux-gnu.tgz</tt></a>:
+<a href="GF-2.1-i686-pc-linux-gnu.tgz"><tt>GF-2.1-i686-pc-linux-gnu.tgz</tt></a>:
 generic Intel binaries
 <br>
 To install, untar with <tt>tar xvfz</tt>, then read <tt>src/INSTALL</tt>
@@ -35,7 +35,7 @@ To install, untar with <tt>tar xvfz</tt>, then read <tt>src/INSTALL</tt>
 </p><h3>Macintosh</h3>
 
 <a
-href="GF-2.0-powerpc-apple-macosx.tgz"><tt>GF-2.0-powerpc-apple-macosx.tgz</tt></a>:
+href="GF-2.1-powerpc-apple-macosx.tgz"><tt>GF-2.1-powerpc-apple-macosx.tgz</tt></a>:
 package with binaries
 <br>
 To install, untar with <tt>tar xvfz</tt>, then read <tt>src/INSTALL</tt>.
@@ -44,7 +44,7 @@ To install, untar with <tt>tar xvfz</tt>, then read <tt>src/INSTALL</tt>.
 
 If you don't have GHC installed, you also need to
 download <a
-href="HaskellSupport.framework.tgz">HaskellSupport.framework.tgz</a>
+href="../download-2.0/HaskellSupport.framework.tgz">HaskellSupport.framework.tgz</a>
 and unpack it in either
 <tt>/Library/Frameworks</tt> or
 <tt>~/Library/Frameworks</tt>.
@@ -56,9 +56,10 @@ href="http://www.haskell.org/hawiki/HaskellSupportFramework">Haskell Wiki</a>.
 
 <h3>Microsoft Windows</h3>
 
-
+Forthcoming; <a href="#src">compile from source</a>
+or see GF 2.0:
 <a
-href="gf.exe"><tt>gf.exe</tt></a>:
+href="../download-2.0/gf.exe"><tt>gf.exe</tt></a>:
 package with binaries and example grammars, self-extracting
 installation package.
 <br>
@@ -67,7 +68,11 @@ To install, execute <tt>gf.exe</tt>.
 
 </p><h3>Solaris</h3>
 
-Binary coming soon; until then <a href="#src">compile from source</a>.
+<a href="GF-2.1-solaris.tgz"><tt>GF-2.1-i686-pc-linux-gnu.tgz</tt></a>:
+Solaris binaries
+<br>
+To install, untar with <tt>gtar xvfz</tt>, then read <tt>src/INSTALL</tt>.
+
 
 
 
@@ -75,11 +80,11 @@ Binary coming soon; until then <a href="#src">compile from source</a>.
 
 <h3><a name=src>Source package</a></h3>
 
-<a href="GF-2.0.tgz"><tt>GF-2.0.tgz</tt></a>:
+<a href="GF-2.1.tgz"><tt>GF-2.1.tgz</tt></a>:
 source and grammar package
 <br>
-Unpack with <tt>tar xvfz GF-2.0.tgz</tt>, and
-follow instructions in <tt>GF-2.0/src/INSTALL</tt>
+Unpack with <tt>tar xvfz GF-2.1.tgz</tt>, and
+follow instructions in <tt>GF-2.1/src/INSTALL</tt>
 
 <p>
 
diff --git a/src/Makefile b/src/Makefile
index cb7593c55..74f179716 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -140,7 +140,7 @@ binary-dist:
 	rm -rf $(BIN_DIST_DIR)
 	mkdir $(BIN_DIST_DIR)
 	./configure --host="$(host)" CPPFLAGS="`lib__readline -I` `lib__ncurses -I`" LDFLAGS="`lib__readline -l` `lib__ncurses -l`"
-	make unix gfdoc jar
+	$(MAKE) unix gfdoc jar
 	$(INSTALL) ../bin/gf util/gfdoc $(BIN_DIST_DIR)
 	$(INSTALL) -m 0644 java/gf-java.jar $(BIN_DIST_DIR)
 	$(INSTALL) configure config.guess config.sub install-sh $(BIN_DIST_DIR)
diff --git a/src/ReleaseProcedure b/src/ReleaseProcedure
index ec7b1e6fc..856932614 100644
--- a/src/ReleaseProcedure
+++ b/src/ReleaseProcedure
@@ -75,7 +75,7 @@ buildarchtranslate: i686: i586
     on a Solaris box, e.g. remote1.cs.chalmers.se):
 
    $ cd src
-   $ ./configure --host=sparc-sun-solaris2 && make binary-dist
+   $ ./configure --host=sparc-sun-solaris2 && gmake binary-dist
 
 13. Build a Mac OS X package (should be done on a Mac OS X box, 
     e.g. csmisc99.cs.chalmers.se):