diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java b/org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
index 6a113fad149..cc0a9918897 100644
--- a/org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
+++ b/org.springframework.aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
@@ -27,8 +27,9 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.ClassUtils;
 
 /**
- * Convenient proxy factory bean superclass for proxy factory
- * beans that create only singletons.
+ * Convenient superclass for proxy-creating
+ * {@link org.springframework.beans.factory.FactoryBean FactoryBean} types that produce
+ * only singleton-scoped objects.
  * 
  * <p>Manages pre- and post-interceptors (references, rather than
  * interceptor names, as in {@link ProxyFactoryBean}) and provides
@@ -36,8 +37,14 @@ import org.springframework.util.ClassUtils;
  *
  * @author Juergen Hoeller
  * @since 2.0
+ * @deprecated as of Spring 3.1 following the deprecation of its only implementation
+ * ({@link org.springframework.transaction.interceptor.TransactionProxyFactoryBean
+ * TransactionProxyFactoryBean}) and generally in favor of providing such functionality
+ * via Spring XML namespaces, e.g. {@code tx:} or {@code @Enable}&#042; annotations, e.g.
+ * {@code @EnableTransactionManagement}.
  */
-@SuppressWarnings("serial")
+@Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		implements FactoryBean<Object>, BeanClassLoaderAware, InitializingBean {
 
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java b/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
index 71c11ec4e36..76027827c92 100644
--- a/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
+++ b/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
@@ -20,7 +20,7 @@ import org.springframework.aop.framework.AbstractSingletonProxyFactoryBean;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "deprecation" })
 public class TestProxyFactoryBean extends AbstractSingletonProxyFactoryBean implements BeanFactoryAware {
 
 	@Override