diff --git a/source/org/jivesoftware/smack/PacketReader.java b/source/org/jivesoftware/smack/PacketReader.java
index 55d31476b..cd12aa008 100644
--- a/source/org/jivesoftware/smack/PacketReader.java
+++ b/source/org/jivesoftware/smack/PacketReader.java
@@ -293,6 +293,10 @@ class PacketReader {
                                         connectionIDLock.notifyAll();
                                     }
                                 }
+                                else if (parser.getAttributeName(i).equals("from")) {
+                                    // Use the server name that the server says that it is.
+                                    connection.host = parser.getAttributeValue(i);
+                                }
                             }
                         }
                     }