diff --git a/source/org/jivesoftware/smack/provider/ProviderManager.java b/source/org/jivesoftware/smack/provider/ProviderManager.java
index 2a97f4068..f7cd792da 100644
--- a/source/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/source/org/jivesoftware/smack/provider/ProviderManager.java
@@ -274,6 +274,19 @@ public class ProviderManager {
         iqProviders.put(key, provider);
     }
 
+    /**
+     * Removes an IQ provider with the specified element name and namespace. This
+     * method is typically called to cleanup providers that are programatically added
+     * using the {@link #addIQProvider(String, String, Object) addIQProvider} method.
+     *
+     * @param elementName the XML element name.
+     * @param namespace the XML namespace.
+     */
+    public static void removeIQProvider(String elementName, String namespace) {
+        String key = getProviderKey(elementName, namespace);
+        iqProviders.remove(key);
+    }
+
     /**
      * Returns the packet extension provider registered to the specified XML element name
      * and namespace. For example, if a provider was registered to the element name "x" and the
@@ -318,6 +331,19 @@ public class ProviderManager {
         extensionProviders.put(key, provider);
     }
 
+    /**
+     * Removes an extension provider with the specified element name and namespace. This
+     * method is typically called to cleanup providers that are programatically added
+     * using the {@link #addExtensionProvider(String, String, Object) addExtensionProvider} method.
+     *
+     * @param elementName the XML element name.
+     * @param namespace the XML namespace.
+     */
+    public static void removeExtensionProvider(String elementName, String namespace) {
+        String key = getProviderKey(elementName, namespace);
+        extensionProviders.remove(key);
+    }
+
     /**
      * Returns an Iterator for all PacketExtensionProvider instances.
      *