diff --git a/source/org/jivesoftware/smackx/PEPListener.java b/source/org/jivesoftware/smackx/PEPListener.java
index 1d3948438..bfe81cedb 100644
--- a/source/org/jivesoftware/smackx/PEPListener.java
+++ b/source/org/jivesoftware/smackx/PEPListener.java
@@ -29,6 +29,7 @@ import org.jivesoftware.smackx.packet.PEPEvent;
  *
  * @author Jeff Williams
  */
+@Deprecated
 public interface PEPListener {
 
     /**
diff --git a/source/org/jivesoftware/smackx/PEPManager.java b/source/org/jivesoftware/smackx/PEPManager.java
index 159b1d378..c30ee88a5 100644
--- a/source/org/jivesoftware/smackx/PEPManager.java
+++ b/source/org/jivesoftware/smackx/PEPManager.java
@@ -60,6 +60,7 @@ import org.jivesoftware.smackx.packet.PEPPubSub;
  * 
  * @author Jeff Williams
  */
+@Deprecated
 public class PEPManager {
 
     private List<PEPListener> pepListeners = new ArrayList<PEPListener>();
diff --git a/source/org/jivesoftware/smackx/packet/PEPEvent.java b/source/org/jivesoftware/smackx/packet/PEPEvent.java
index 48f1de25a..e9dab0e84 100644
--- a/source/org/jivesoftware/smackx/packet/PEPEvent.java
+++ b/source/org/jivesoftware/smackx/packet/PEPEvent.java
@@ -30,6 +30,7 @@ import org.jivesoftware.smack.packet.PacketExtension;
  *
  * @author Jeff Williams
  */
+@Deprecated
 public class PEPEvent implements PacketExtension {
 
     PEPItem item;
diff --git a/source/org/jivesoftware/smackx/packet/PEPItem.java b/source/org/jivesoftware/smackx/packet/PEPItem.java
index c3ff6f4f0..b216ebb66 100644
--- a/source/org/jivesoftware/smackx/packet/PEPItem.java
+++ b/source/org/jivesoftware/smackx/packet/PEPItem.java
@@ -30,6 +30,7 @@ import org.jivesoftware.smack.packet.PacketExtension;
  *
  * @author Jeff Williams
  */
+@Deprecated
 public abstract class PEPItem implements PacketExtension {
     
     String id;
diff --git a/source/org/jivesoftware/smackx/packet/PEPPubSub.java b/source/org/jivesoftware/smackx/packet/PEPPubSub.java
index 420ce6127..780bea210 100644
--- a/source/org/jivesoftware/smackx/packet/PEPPubSub.java
+++ b/source/org/jivesoftware/smackx/packet/PEPPubSub.java
@@ -30,6 +30,7 @@ import org.jivesoftware.smack.packet.IQ;
  *
  * @author Jeff Williams
  */
+@Deprecated
 public class PEPPubSub extends IQ {
     
     PEPItem item;