diff --git a/history.txt b/history.txt
index 7319ee2672..de28b4f586 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2009-05-23 Mathiasdm
+    * Router netDB:
+      - Added flags to the netDB page
+
 2009-05-22 Mathiasdm
     * desktopgui:
       - Updating works in general config
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 436fc526e3..a2075e7119 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -1067,6 +1067,11 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
         else
             buf.append("Published: <i>in ").append(DataHelper.formatDuration(0-age)).append("???</i><br />\n");
         buf.append("Address(es): <i>");
+        String country = _context.commSystem().getCountry(info.getIdentity().getHash());
+        if(country != null) {
+            buf.append(" <img alt=\"").append(country.toUpperCase()).append("\"");
+            buf.append("\" src=\"/flags.jsp?c=").append(country).append("\">");
+        }
         for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) {
             RouterAddress addr = (RouterAddress)iter.next();
             buf.append(addr.getTransportStyle()).append(": ");