diff --git a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
index 203498f13c..7f3fa1fa1a 100644
--- a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
+++ b/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
@@ -100,47 +100,4 @@ public class HPSFRuntimeException extends RuntimeException
     {
         return reason;
     }
-
-
-
-//    /**
-//     * @see Throwable#printStackTrace()
-//     */
-//    public void printStackTrace()
-//    {
-//        printStackTrace(System.err);
-//    }
-
-
-
-//    /**
-//     * @see Throwable#printStackTrace(java.io.PrintStream)
-//     */
-//    public void printStackTrace(final PrintStream p)
-//    {
-//        final Throwable reason = getReason();
-//        super.printStackTrace(p);
-//        if (reason != null)
-//        {
-//            p.println("Caused by:");
-//            reason.printStackTrace(p);
-//        }
-//    }
-
-
-
-//    /**
-//     * @see Throwable#printStackTrace(java.io.PrintWriter)
-//     */
-//    public void printStackTrace(final PrintWriter p)
-//    {
-//        final Throwable reason = getReason();
-//        super.printStackTrace(p);
-//        if (reason != null)
-//        {
-//            p.println("Caused by:");
-//            reason.printStackTrace(p);
-//        }
-//    }
-
 }
diff --git a/src/java/org/apache/poi/hpsf/Util.java b/src/java/org/apache/poi/hpsf/Util.java
index 62a384a3dd..57ae6e2d23 100644
--- a/src/java/org/apache/poi/hpsf/Util.java
+++ b/src/java/org/apache/poi/hpsf/Util.java
@@ -23,6 +23,8 @@ import java.io.StringWriter;
 import java.util.Collection;
 import java.util.Date;
 
+import org.apache.poi.util.SuppressForbidden;
+
 /**
  * <p>Provides various static utility methods.</p>
  *
@@ -332,6 +334,7 @@ public class Util
      * @return a string containing the output of a call to
      * <code>t.printStacktrace()</code>.
      */
+    @SuppressForbidden("uses printStackTrace")
     public static String toString(final Throwable t)
     {
         final StringWriter sw = new StringWriter();
diff --git a/src/java/org/apache/poi/util/SystemOutLogger.java b/src/java/org/apache/poi/util/SystemOutLogger.java
index 7804334273..a13882f56d 100644
--- a/src/java/org/apache/poi/util/SystemOutLogger.java
+++ b/src/java/org/apache/poi/util/SystemOutLogger.java
@@ -57,6 +57,7 @@ public class SystemOutLogger extends POILogger
      * @param obj1 The object to log.  This is converted to a string.
      * @param exception An exception to be logged
      */
+    @SuppressForbidden("uses printStackTrace")
     public void log(final int level, final Object obj1,
                     final Throwable exception) {
         if (check(level)) {
diff --git a/src/resources/devtools/forbidden-signatures-prod.txt b/src/resources/devtools/forbidden-signatures-prod.txt
index bc63b5b3c7..59dcf47890 100644
--- a/src/resources/devtools/forbidden-signatures-prod.txt
+++ b/src/resources/devtools/forbidden-signatures-prod.txt
@@ -28,3 +28,5 @@
 
 java.lang.System#gc() @ Please do not try to stop the world
 java.lang.Throwable#printStackTrace() @ Please use POILogger for exceptions
+java.lang.Throwable#printStackTrace(java.io.PrintStream) @ Please use POILogger for exceptions
+java.lang.Throwable#printStackTrace(java.io.PrintWriter) @ Please use POILogger for exceptions
\ No newline at end of file