diff --git a/CHANGES.txt b/CHANGES.txt
index efca7f4c9..6fdb11517 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -108,6 +108,8 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    CHUKWA-619. Disabled trace method on Chukwa servlets. (Julio Conca via Eric Yang)
+
     CHUKWA-617. Fixed test case casting and race conditions. (Eric Yang)
 
     CHUKWA-616. Updated release note and change log generation. (Eric Yang)
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
index 543456e6b..fd1b82f9e 100644
--- a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
+++ b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/CommitCheckServlet.java
@@ -68,6 +68,11 @@ public void init(ServletConfig servletConf) throws ServletException {
       throw new ServletException(e);
     }
   }
+
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
   
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
index c9f624596..1bd117bd6 100644
--- a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
+++ b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/LogDisplayServlet.java
@@ -81,6 +81,11 @@ public LogDisplayServlet(Configuration c) {
   public void init(ServletConfig servletConf) throws ServletException {
     BUF_SIZE = conf.getLong(BUF_SIZE_OPT, BUF_SIZE);
   }
+
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
   
   private String getSID(Chunk c) {
     try { 
diff --git a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
index f8badd8b8..454a269ef 100644
--- a/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
+++ b/src/main/java/org/apache/hadoop/chukwa/datacollection/collector/servlet/ServletCollector.java
@@ -116,6 +116,11 @@ public void run() {
     }
   }
 
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
+
   protected void accept(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException {
     numberHTTPConnection++;
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java b/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
index 84064da84..a2115a607 100644
--- a/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
+++ b/src/main/java/org/apache/hadoop/chukwa/hicc/Iframe.java
@@ -31,6 +31,11 @@
 public class Iframe extends HttpServlet {
   public static final long serialVersionUID = 100L;
 
+  @Override
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { 
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
+
   public void doGet(HttpServletRequest request, HttpServletResponse response)
       throws IOException, ServletException {
     String id;
diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java b/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
index 04be96430..988aef39a 100644
--- a/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
+++ b/src/main/java/org/apache/hadoop/chukwa/hicc/Workspace.java
@@ -35,6 +35,11 @@ public class Workspace extends HttpServlet {
   private String user = "admin";
   private XssFilter xf = null;
 
+  @Override  
+  protected void doTrace(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+    resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED); 
+  }
+
   public void doGet(HttpServletRequest request, HttpServletResponse response)
       throws IOException, ServletException {
     xf = new XssFilter(request);