diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
index cc7b8432b..6c2900dcb 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
@@ -51,7 +51,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
  *
  * @author Matt Tucker
  */
-public class Message extends Packet {
+public final class Message extends Packet {
 
     public static final String ELEMENT = "message";
     public static final String BODY = "body";
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
index 9c12d2061..56d042eba 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
@@ -55,7 +55,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
  * @see RosterPacket
  * @author Matt Tucker
  */
-public class Presence extends Packet {
+public final class Presence extends Packet {
 
     public static final String ELEMENT = "presence";