diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/NeedBracesCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/NeedBracesCheck.java
new file mode 100644
index 000000000..38abda7f6
--- /dev/null
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/NeedBracesCheck.java
@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code for adherence to a set of rules.
+// Copyright (C) 2001-2002  Oliver Burn
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+////////////////////////////////////////////////////////////////////////////////
+
+package com.puppycrawl.tools.checkstyle.checks;
+
+
+import com.puppycrawl.tools.checkstyle.api.Check;
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+import com.puppycrawl.tools.checkstyle.api.TokenTypes;
+
+/**
+ *  Checks for missing braces {}'s for the following constructs:
+ * <ul>
+ * <li>if/else</li>
+ * <li>while</li>
+ * <li>for</li>
+ * <li>do/while</li>
+ * </ul>
+ *
+ * @author Rick Giles
+ * @version 1.0
+ */
+public class NeedBracesCheck
+    extends Check
+{
+    /** @see com.puppycrawl.tools.checkstyle.api.Check */
+    public int[] getDefaultTokens()
+    {
+        return new int[] {
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_WHILE,
+        };
+    }
+
+    /** @see com.puppycrawl.tools.checkstyle.api.Check */
+    public void visitToken(DetailAST aAST)
+    {
+        final DetailAST sListAST = aAST.findFirstToken(TokenTypes.SLIST);
+        boolean isElseIf = false;
+        if ((aAST.getType() == TokenTypes.LITERAL_ELSE)
+            && (aAST.findFirstToken(TokenTypes.LITERAL_IF) != null))
+        {
+            isElseIf = true;
+        }
+        if (sListAST == null && !isElseIf) {
+            log(aAST.getLineNo(), "needBraces", aAST.getText());
+        }
+    }
+}