diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index fa2ebc6e8..7c743fc7b 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java
@@ -180,6 +180,7 @@ jP69nPbh4KLGhF+SD0+0bW4=
     private static final void genKeysCLI(String publicKeyFile, String privateKeyFile) {
         FileOutputStream fileOutputStream = null;
 
+        _context = I2PAppContext.getGlobalContext();
         try {
             Object signingKeypair[] = _context.keyGenerator().generateSigningKeypair();
             SigningPublicKey signingPublicKey = (SigningPublicKey) signingKeypair[0];
diff --git a/history.txt b/history.txt
index b8694c2ef..e07cdaaca 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.599 2007-12-01 22:13:15 complication Exp $
+$Id: history.txt,v 1.600 2007-12-02 23:19:25 complication Exp $
+
+2007-12-10 zzz
+    * Fix NPE in CLI TrustedUpdate keygen
 
 2007-12-02 Complication
     * Commit SAM v2 patch from mkvore (thank you!)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87062b470..6f9b3b154 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.534 $ $Date: 2007-12-01 22:13:18 $";
+    public final static String ID = "$Revision: 1.535 $ $Date: 2007-12-02 23:19:28 $";
     public final static String VERSION = "0.6.1.30";
-    public final static long BUILD = 6;
+    public final static long BUILD = 7;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);