diff --git a/source/org/jivesoftware/smack/Chat.java b/source/org/jivesoftware/smack/Chat.java
index 1e93ea08b..75b7ff2c0 100644
--- a/source/org/jivesoftware/smack/Chat.java
+++ b/source/org/jivesoftware/smack/Chat.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/GroupChat.java b/source/org/jivesoftware/smack/GroupChat.java
index 7aa5e7ab3..01080ecf1 100644
--- a/source/org/jivesoftware/smack/GroupChat.java
+++ b/source/org/jivesoftware/smack/GroupChat.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/PacketCollector.java b/source/org/jivesoftware/smack/PacketCollector.java
index 326adedc1..8434070b5 100644
--- a/source/org/jivesoftware/smack/PacketCollector.java
+++ b/source/org/jivesoftware/smack/PacketCollector.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/PacketListener.java b/source/org/jivesoftware/smack/PacketListener.java
index 8a93f2d5d..6f3a00c8a 100644
--- a/source/org/jivesoftware/smack/PacketListener.java
+++ b/source/org/jivesoftware/smack/PacketListener.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/PacketReader.java b/source/org/jivesoftware/smack/PacketReader.java
index c0a49664d..e4428fb90 100644
--- a/source/org/jivesoftware/smack/PacketReader.java
+++ b/source/org/jivesoftware/smack/PacketReader.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/PacketWriter.java b/source/org/jivesoftware/smack/PacketWriter.java
index 50ac20299..63e055607 100644
--- a/source/org/jivesoftware/smack/PacketWriter.java
+++ b/source/org/jivesoftware/smack/PacketWriter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/Roster.java b/source/org/jivesoftware/smack/Roster.java
index f6a2e63cf..5f72ef73a 100644
--- a/source/org/jivesoftware/smack/Roster.java
+++ b/source/org/jivesoftware/smack/Roster.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/SSLXMPPConnection.java b/source/org/jivesoftware/smack/SSLXMPPConnection.java
index 5d75d6118..2badae4b5 100644
--- a/source/org/jivesoftware/smack/SSLXMPPConnection.java
+++ b/source/org/jivesoftware/smack/SSLXMPPConnection.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index 1e5ff77bf..28d4311eb 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/XMPPException.java b/source/org/jivesoftware/smack/XMPPException.java
index 0801e89f1..a272a1455 100644
--- a/source/org/jivesoftware/smack/XMPPException.java
+++ b/source/org/jivesoftware/smack/XMPPException.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/AndFilter.java b/source/org/jivesoftware/smack/filter/AndFilter.java
index f6bdc0e9c..75f250392 100644
--- a/source/org/jivesoftware/smack/filter/AndFilter.java
+++ b/source/org/jivesoftware/smack/filter/AndFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/FromContainsFilter.java b/source/org/jivesoftware/smack/filter/FromContainsFilter.java
index b0fcffa88..1356c2d2e 100644
--- a/source/org/jivesoftware/smack/filter/FromContainsFilter.java
+++ b/source/org/jivesoftware/smack/filter/FromContainsFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/OrFilter.java b/source/org/jivesoftware/smack/filter/OrFilter.java
index a0590a2cd..7d8204e33 100644
--- a/source/org/jivesoftware/smack/filter/OrFilter.java
+++ b/source/org/jivesoftware/smack/filter/OrFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/PacketFilter.java b/source/org/jivesoftware/smack/filter/PacketFilter.java
index e1e19c987..e9e58cdf1 100644
--- a/source/org/jivesoftware/smack/filter/PacketFilter.java
+++ b/source/org/jivesoftware/smack/filter/PacketFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/PacketIDFilter.java b/source/org/jivesoftware/smack/filter/PacketIDFilter.java
index 1f3609318..1aebeb095 100644
--- a/source/org/jivesoftware/smack/filter/PacketIDFilter.java
+++ b/source/org/jivesoftware/smack/filter/PacketIDFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/PacketTypeFilter.java b/source/org/jivesoftware/smack/filter/PacketTypeFilter.java
index 56a1c9635..7201e70ee 100644
--- a/source/org/jivesoftware/smack/filter/PacketTypeFilter.java
+++ b/source/org/jivesoftware/smack/filter/PacketTypeFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/ThreadFilter.java b/source/org/jivesoftware/smack/filter/ThreadFilter.java
index a7868bb4f..42c92a517 100644
--- a/source/org/jivesoftware/smack/filter/ThreadFilter.java
+++ b/source/org/jivesoftware/smack/filter/ThreadFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/filter/ToContainsFilter.java b/source/org/jivesoftware/smack/filter/ToContainsFilter.java
index 742e51cd8..2932225b2 100644
--- a/source/org/jivesoftware/smack/filter/ToContainsFilter.java
+++ b/source/org/jivesoftware/smack/filter/ToContainsFilter.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/packet/Authentication.java b/source/org/jivesoftware/smack/packet/Authentication.java
index 1db352513..83fb3b9a5 100644
--- a/source/org/jivesoftware/smack/packet/Authentication.java
+++ b/source/org/jivesoftware/smack/packet/Authentication.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/packet/Error.java b/source/org/jivesoftware/smack/packet/Error.java
index 863c9ba8d..b93b59251 100644
--- a/source/org/jivesoftware/smack/packet/Error.java
+++ b/source/org/jivesoftware/smack/packet/Error.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/packet/IQ.java b/source/org/jivesoftware/smack/packet/IQ.java
index 69057bdf0..eca37dd02 100644
--- a/source/org/jivesoftware/smack/packet/IQ.java
+++ b/source/org/jivesoftware/smack/packet/IQ.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/packet/Message.java b/source/org/jivesoftware/smack/packet/Message.java
index fcbc90edb..ef91652df 100644
--- a/source/org/jivesoftware/smack/packet/Message.java
+++ b/source/org/jivesoftware/smack/packet/Message.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/packet/Packet.java b/source/org/jivesoftware/smack/packet/Packet.java
index 11a37cd34..34ff54891 100644
--- a/source/org/jivesoftware/smack/packet/Packet.java
+++ b/source/org/jivesoftware/smack/packet/Packet.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/packet/Presence.java b/source/org/jivesoftware/smack/packet/Presence.java
index c70413028..33d0c9cec 100644
--- a/source/org/jivesoftware/smack/packet/Presence.java
+++ b/source/org/jivesoftware/smack/packet/Presence.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written
diff --git a/source/org/jivesoftware/smack/util/StringUtils.java b/source/org/jivesoftware/smack/util/StringUtils.java
index d9d8192a2..2c589c3f1 100644
--- a/source/org/jivesoftware/smack/util/StringUtils.java
+++ b/source/org/jivesoftware/smack/util/StringUtils.java
@@ -29,7 +29,7 @@
  * 4. The names "Smack" and "Jive Software" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please
- *    contact webmaster@coolservlets.com.
+ *    contact webmaster@jivesoftware.com.
  *
  * 5. Products derived from this software may not be called "Smack",
  *    nor may "Smack" appear in their name, without prior written