diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index d582109019..5cfc37ac5d 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -171,7 +171,9 @@ public class I2PAppContext {
                     _globalAppContext = this;
             }
         }
-        _overrideProps = new I2PProperties(envProps);
+        _overrideProps = new I2PProperties();
+        if (envProps != null)
+            _overrideProps.putAll(envProps);
         _statManager = null;
         _sessionKeyManager = null;
         _namingService = null;
diff --git a/history.txt b/history.txt
index b7f9b2d0c3..10b56aef29 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,40 @@
+2011-01-31 zzz
+    * Console: Put all socket handlers in same thread pool,
+               set min/max threads and idle timeout
+    * Context: Fix properties init
+    * DataStructures:
+      - Cleanups
+    * DecayingBloomFilter, DecayingHashSet: Cleanups and speedups
+    * Findbugs: Lots of cleanups
+    * I2CP:
+      - Add experimental bandwidth limiter
+      - Add I2PSession API method to update tunnel and bandwidth
+        configuration on an existing session
+      - Filter more system properties before passing them to the router
+      - Start work on passing per-message flags to the router via I2CP
+    * I2PAppContext: New getProperties() method
+    * i2ptunnel:
+      - Use context properties as defaults
+    * NetDB, DatabaseStoreMessage:
+      - Convert everything from DataStructure to the
+        new DatabaseEntry superclass
+      - Optimizations made possible by DatabaseEntry
+      - Don't rescan netDb directory unless changed
+    * OCMOSJ:
+      - Don't send expired messages
+      - Clean up stat init
+    * PeerManager: Make calculators static, take out of router context
+    * Router:
+      - Add new RandomIterator, use in UDP, peer selector,
+        profile organizer
+      - Add a stat to monitor peer selector run time
+    * RouterContext: Clean up clock overrides
+    * Streaming:
+      - Add new real sockets for easier porting of apps.
+        See http://zzz.i2p/topics/792 for info. Untested.
+      - Case cleanups
+      - Javadoc
+
 * 2011-01-24  0.8.3 released
 
 2011-01-16 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b00998..87e5bffca0 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";