diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 9208db2..b613cd9 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -1157,6 +1157,9 @@
     if (lType->isRealType() && rType->isRealType())
       return Context.IntTy;
   } else {
+    if (lType->isRealType() && rType->isRealType()) 
+      Diag(loc, diag::warn_floatingpoint_eq);
+
     if (lType->isArithmeticType() && rType->isArithmeticType())
       return Context.IntTy;
   }
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index f2437d6..8b1b143 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -696,7 +696,7 @@
 DIAG(warn_unused_expr, WARNING,
      "expression result unused")
 
-// Extra checking for finding simple bugs.
+// CHECK: printf format string errors
 DIAG(warn_printf_not_string_constant, WARNING,
      "format string is not a string literal (potentially insecure)")
 DIAG(warn_printf_write_back, WARNING,
@@ -716,11 +716,16 @@
 DIAG(warn_printf_format_string_contains_null_char, WARNING,
   "format string contains '\\0' within the string body")
 
+// CHECK: returning address/reference of stack memory
 DIAG(warn_ret_stack_addr, WARNING,
   "address of stack memory associated with local variable '%0' returned")
 DIAG(warn_ret_stack_ref, WARNING,
   "reference to stack memory associated with local variable '%0' returned")
 
+// CHECK: floating point values should not use "==" or "!="
+DIAG(warn_floatingpoint_eq, WARNING,
+  "comparing floating point with == or != is unsafe")
+
 // CFString checking
 DIAG(err_cfstring_literal_not_string_constant, ERROR,
   "CFString literal is not a string constant")
diff --git a/test/Sema/floating-point-compare.c b/test/Sema/floating-point-compare.c
new file mode 100644
index 0000000..008bedf
--- /dev/null
+++ b/test/Sema/floating-point-compare.c
@@ -0,0 +1,9 @@
+// RUN: clang -parse-ast-check %s
+
+int foo(float x, float y) {
+  return x == y; // expected-warning {{comparing floating point with ==}}
+} 
+
+int bar(float x, float y) {
+  return x != y; // expected-warning {{comparing floating point with ==}}
+}
\ No newline at end of file