diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
index ebd0ee913f5ee006194075d1f7030ad11c5397af..b0a150bd1fe794f512142b8afa299cf67d80c633 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
@@ -30,9 +30,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Properties;
 
 import net.i2p.data.DataFormatException;
@@ -151,10 +151,9 @@ public class AddressbookBean extends BaseBean
 			fis =  new FileInputStream( getFileName() );
 			addressbook.load( fis );
 			LinkedList<AddressBean> list = new LinkedList<AddressBean>();
-			Enumeration e = addressbook.keys();
-			while( e.hasMoreElements() ) {
-				String name = (String)e.nextElement();
-				String destination = addressbook.getProperty( name );
+			for( Map.Entry<Object, Object> entry : addressbook.entrySet() ) {
+				String name = (String) entry.getKey();
+				String destination = (String) entry.getValue();
 				if( filter != null && filter.length() > 0 ) {
 					if( filter.compareTo( "0-9" ) == 0 ) {
 						char first = name.charAt(0);
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java
index d74f94ff6a91678816068cac140e2f2c30470a41..faa5d09db37e3d94481348bcfd7b6e5b8792d93f 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java
@@ -88,7 +88,7 @@ public class ConfigBean implements Serializable {
 				// use loadProps to trim
 				Properties props = new OrderedProperties();
 				DataHelper.loadProps(props, file);
-				for (Map.Entry e : props.entrySet()) {
+				for (Map.Entry<Object, Object> e : props.entrySet()) {
 					buf.append((String) e.getKey()).append('=')
 					   .append((String) e.getValue()).append('\n');
 				}