diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index cb3c63662..7fa3c4607 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -351,6 +351,18 @@ public class RouterContext extends I2PAppContext {
         return super.getProperty(propName, defaultVal);
     }
 
+    /**
+     * @return new Properties with system and context properties
+     * @since 0.8.4
+     */
+    @Override
+    public Properties getProperties() { 
+        Properties rv = super.getProperties();
+        if (_router != null)
+            rv.putAll(_router.getConfigMap());
+        return rv;
+    }
+    
     /**
      * The context's synchronized clock, which is kept context specific only to
      * enable simulators to play with clock skew among different instances.