diff --git a/.ghci b/.ghci
index 2af14c533..5da296450 100644
--- a/.ghci
+++ b/.ghci
@@ -1,2 +1,2 @@
-:set -isrc/compiler -isrc/runtime/haskell -isrc/server -isrc/example-based -isrc/server/transfer -idist/build/autogen -idist/build/gf/gf-tmp 
+:set -isrc/compiler -isrc/binary -isrc/runtime/haskell -isrc/server -isrc/example-based -isrc/server/transfer -idist/build/autogen -idist/build/gf/gf-tmp 
 :set -fwarn-unused-imports -optP-DSERVER_MODE -optP-DUSE_INTERRUPT -optP-DCC_LAZY -optP-include -optPdist/build/autogen/cabal_macros.h -odir dist/build/gf/gf-tmp -hidir dist/build/gf/gf-tmp -stubdir dist/build/gf/gf-tmp
diff --git a/download/encoding-change.t2t b/download/encoding-change.t2t
index c62b132f9..b5d7d4059 100644
--- a/download/encoding-change.t2t
+++ b/download/encoding-change.t2t
@@ -6,16 +6,17 @@ Thomas Hallgren
 %!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
 %!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
 
-==Planned changes to character encodings in GF grammar files ==
+==Changes to character encodings in GF grammar files ==
 
-We plan to make two changes:
+Between the release of GF 3.5 and the next version, two changes were made
+relating to character encodings in GF grammar files:
 
-+ Currently the default character encoding in GF grammar files is Latin-1
-(also known as iso-8859-1, cp1252). We plan to change the default to UTF-8.
++ The default character encoding was changed from Latin-1
+(also known as iso-8859-1, cp1252) to UTF-8.
 
-+ It is currently possible to use another character encoding by specifying it
-with a ``flags coding = ...`` declaration in the source file. We plan to change
-this to use a pragma ``--# -coding=...`` at the top of the file instead.
++ They way you specify alternate character encodings was changed. Instead of
+  using a ``flags coding = ...`` declaration in the source file, you should now
+  use a pragma ``--# -coding=...`` at the top of the file instead.
 
 
 == Advantages ==
diff --git a/download/release-next.t2t b/download/release-next.t2t
index 8e1e33c26..4dc66e9b5 100644
--- a/download/release-next.t2t
+++ b/download/release-next.t2t
@@ -14,15 +14,23 @@ See the [download page http://www.grammaticalframework.org/download/index.html].
 Over [...] changes have been pushed to the source repository since the release
 of GF 3.5.
 
-Closed issues: 25, 30, 41, 57, 60, 61, 68, 80.
+Closed issues: 25, 30, 41, 57, 60, 61, 68, 80, 81.
 
 ===GF compiler and run-time library===
 
+- Token gluing, BIND, SOFT_BIND [...]
+- ``nonExist`` now exists. [...]
 - The default character encoding in grammar files has been changed from
   Latin-1 to UTF-8. Also, alternate character encodings should now be specified
   as ``--# -coding=``//enc//, instead of ``flags coding=``//enc//.
   See the separate document
   [GF character encoding changes encoding-change.html] for more details.
+- Unicode characters in identifiers [...]
+- The PGF file format has changed in minor but backward incompatible ways
+  GF can still read the old format, thanks to a backward compatibility
+  module. Old PGF files can be converted to the new format by loading them
+  in the GF shell and writing out a new PGF file with the ``pg -pgf`` command.
+
 - Nonlinear patterns (i.e., patterns where the same variable appears more than
   once) in concrete syntax are now detected and reported as errors.
   (Section C.4.13 in the GF book explicitly states that patterns must be
@@ -33,8 +41,9 @@ Closed issues: 25, 30, 41, 57, 60, 61, 68, 80.
 - The refresh pass
 % (and thus the command line option --dump-refresh)
   had become obsolete and has been removed.
-- ``nonExist`` now exists. [...]
-- Unicode characters in identifiers [...]
+- The old partial evaluator
+  (and thus the command line options --new-comp and --old-comp)
+  has been removed.
 
 
 ===Resource Grammar Library===
diff --git a/gf.cabal b/gf.cabal
index 7cc7e2d28..84078a082 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -83,7 +83,9 @@ Library
     build-depends: binary
 
   ghc-options: -fwarn-unused-imports
+  ghc-prof-options: -auto-all
   extensions: 
+
   exposed-modules: 
     PGF
     PGF.Data