diff --git a/LICENSE b/LICENSE
index 8be7b96b8..e7b83f1c8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@ BSD License
 
 For Infer software
 
-Copyright (c) 2013-, Facebook, Inc. All rights reserved.
+Copyright (c) 2013-present, Facebook, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/examples/ios_hello/HelloWorldApp/AppDelegate.h b/examples/ios_hello/HelloWorldApp/AppDelegate.h
index a49e6e973..ea98a9e43 100644
--- a/examples/ios_hello/HelloWorldApp/AppDelegate.h
+++ b/examples/ios_hello/HelloWorldApp/AppDelegate.h
@@ -2,9 +2,6 @@
 //  AppDelegate.h
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import <UIKit/UIKit.h>
 
diff --git a/examples/ios_hello/HelloWorldApp/AppDelegate.m b/examples/ios_hello/HelloWorldApp/AppDelegate.m
index c6444c28e..928648b19 100644
--- a/examples/ios_hello/HelloWorldApp/AppDelegate.m
+++ b/examples/ios_hello/HelloWorldApp/AppDelegate.m
@@ -2,9 +2,6 @@
 //  AppDelegate.m
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import "AppDelegate.h"
 #import "Hello.h"
diff --git a/examples/ios_hello/HelloWorldApp/Base.lproj/LaunchScreen.xib b/examples/ios_hello/HelloWorldApp/Base.lproj/LaunchScreen.xib
index a2f15cf94..02ed79f15 100644
--- a/examples/ios_hello/HelloWorldApp/Base.lproj/LaunchScreen.xib
+++ b/examples/ios_hello/HelloWorldApp/Base.lproj/LaunchScreen.xib
@@ -11,7 +11,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Dulma Rodriguez. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  ." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
diff --git a/examples/ios_hello/HelloWorldApp/Hello.h b/examples/ios_hello/HelloWorldApp/Hello.h
index 64c98528a..4cd44d1f9 100644
--- a/examples/ios_hello/HelloWorldApp/Hello.h
+++ b/examples/ios_hello/HelloWorldApp/Hello.h
@@ -2,9 +2,6 @@
 //  Hello.h
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import <Foundation/Foundation.h>
 
diff --git a/examples/ios_hello/HelloWorldApp/Hello.m b/examples/ios_hello/HelloWorldApp/Hello.m
index 4dcd9842c..5cb640358 100644
--- a/examples/ios_hello/HelloWorldApp/Hello.m
+++ b/examples/ios_hello/HelloWorldApp/Hello.m
@@ -2,9 +2,6 @@
 //  Hello.m
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import <Foundation/Foundation.h>
 #import "Hello.h"
diff --git a/examples/ios_hello/HelloWorldApp/ViewController.h b/examples/ios_hello/HelloWorldApp/ViewController.h
index 4ca61a835..304addab1 100644
--- a/examples/ios_hello/HelloWorldApp/ViewController.h
+++ b/examples/ios_hello/HelloWorldApp/ViewController.h
@@ -2,9 +2,6 @@
 //  ViewController.h
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import <UIKit/UIKit.h>
 
diff --git a/examples/ios_hello/HelloWorldApp/ViewController.m b/examples/ios_hello/HelloWorldApp/ViewController.m
index 184a77155..6370a7a15 100644
--- a/examples/ios_hello/HelloWorldApp/ViewController.m
+++ b/examples/ios_hello/HelloWorldApp/ViewController.m
@@ -2,9 +2,6 @@
 //  ViewController.m
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import "ViewController.h"
 
diff --git a/examples/ios_hello/HelloWorldApp/main.m b/examples/ios_hello/HelloWorldApp/main.m
index 299addb83..c8dbb4122 100644
--- a/examples/ios_hello/HelloWorldApp/main.m
+++ b/examples/ios_hello/HelloWorldApp/main.m
@@ -2,9 +2,6 @@
 //  main.m
 //  HelloWorldApp
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
-//
 
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
diff --git a/examples/ios_hello/HelloWorldAppTests/HelloWorldAppTests.m b/examples/ios_hello/HelloWorldAppTests/HelloWorldAppTests.m
index f40845acd..801d1d932 100644
--- a/examples/ios_hello/HelloWorldAppTests/HelloWorldAppTests.m
+++ b/examples/ios_hello/HelloWorldAppTests/HelloWorldAppTests.m
@@ -2,8 +2,6 @@
 //  HelloWorldAppTests.m
 //  HelloWorldAppTests
 //
-//  Created by Dulma Rodriguez on 20/05/2015.
-//  Copyright (c) 2015 Dulma Rodriguez. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
diff --git a/infer/bin/BuckAnalyze b/infer/bin/BuckAnalyze
index 4283fad2e..407f02390 100755
--- a/infer/bin/BuckAnalyze
+++ b/infer/bin/BuckAnalyze
@@ -1,4 +1,5 @@
 #!/usr/bin/env python2.7
+
 #
 # Copyright (c) 2013-present Facebook. All rights reserved.
 #
diff --git a/infer/bin/inferJ b/infer/bin/inferJ
index 56597dbd7..e479501ea 100755
--- a/infer/bin/inferJ
+++ b/infer/bin/inferJ
@@ -1,4 +1,5 @@
 #!/usr/bin/env python2.7
+
 #
 # Copyright (c) 2013- Facebook.  All rights reserved.
 #
diff --git a/infer/bin/inferTraceBugs b/infer/bin/inferTraceBugs
index 736a01547..0430b5e22 100755
--- a/infer/bin/inferTraceBugs
+++ b/infer/bin/inferTraceBugs
@@ -1,4 +1,5 @@
 #!/usr/bin/env python2.7
+
 #
 # Copyright (c) 2013-present Facebook. All rights reserved.
 #
diff --git a/infer/src/backend/checkCopyright.ml b/infer/src/backend/checkCopyright.ml
new file mode 100644
index 000000000..47b86c184
--- /dev/null
+++ b/infer/src/backend/checkCopyright.ml
@@ -0,0 +1,200 @@
+(*
+* Copyright (c) 2015 - present Facebook, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the BSD style license found in the
+* LICENSE file in the root directory of this source tree. An additional grant
+* of patent rights can be found in the PATENTS file in the same directory.
+*)
+
+module L = Logging
+module F = Format
+open Utils
+
+(** If active, check copyright messages and exit. *)
+let active = Config.from_env_variable "INFER_CHECK_COPYRIGHT"
+
+(** If true, update the copyright message of the files. *)
+let update_files = true
+
+let line_contains_copyright line =
+  string_contains "opyright " line
+
+let rec find_copyright_line lines n = match lines with
+  | [] -> None
+  | line :: lines' ->
+      if line_contains_copyright line then Some n
+      else find_copyright_line lines' (n + 1)
+
+let find_copyright_start lines_arr n check_hash =
+  let is_start line =
+    if check_hash then
+      not (string_is_prefix "#" line)
+    else
+      string_contains "(*" line
+      ||
+      string_contains "/*" line in
+  let i = ref (n - 1) in
+  let found = ref 0 in
+  while !i >= 0 && !found = 0 do
+    if is_start lines_arr.(!i) then found := !i + 1;
+    decr i
+  done;
+  !found
+
+let find_copyright_end lines_arr n check_hash =
+  let is_end line =
+    if check_hash then
+      not (string_is_prefix "#" line)
+    else
+      string_contains "*)" line
+      ||
+      string_contains "*/" line in
+  let i = ref (n + 1) in
+  let len = Array.length lines_arr in
+  let found = ref (len - 1) in
+  while !i < len && !found = len - 1 do
+    if is_end lines_arr.(!i) then found := !i - 1;
+    incr i
+  done;
+  !found
+
+(** Heuristic to check if this looks like a copyright message. *)
+let looks_like_copyright_message cstart cend lines_arr =
+  let max_len = 100 in
+  let check_len () =
+    let ok = ref true in
+    for i = cstart to cend do
+      if String.length lines_arr.(i) > max_len then ok := false
+    done;
+    !ok in
+  (cend - cstart) <= 10 && check_len ()
+
+let contains_monoidics cstart cend lines_arr =
+  let found = ref false in
+  for i = cstart to cend do
+    if string_contains "Monoidics" lines_arr.(i) then found := true
+  done;
+  !found
+
+let get_fb_year cstart cend lines_arr =
+  let found = ref None in
+  let do_line line =
+    try
+      let fmt_re = Str.regexp "[0-9]+" in
+      let _ = Str.search_forward fmt_re line 0 in
+      let fmt_match = Str.matched_string line in
+      if String.length fmt_match = 4 then
+        try
+          found := Some (int_of_string fmt_match)
+        with _ -> ()
+    with Not_found -> () in
+  for i = cstart to cend do
+    let line = lines_arr.(i) in
+    if string_contains "Facebook" line then
+      do_line line
+  done;
+  !found
+
+let pp_copyright mono fb_year check_hash fmt _prefix =
+  let prefix = _prefix ^ (if check_hash then "#" else "*") in
+  let pp_line str = F.fprintf fmt "%s%s@." prefix str in
+  if mono then
+    pp_line " Copyright (c) 2009 - 2013 Monoidics ltd.";
+  pp_line (F.sprintf " Copyright (c) %d - present Facebook, Inc." fb_year);
+  pp_line " All rights reserved.";
+  pp_line "";
+  pp_line " This source code is licensed under the BSD style license found in the";
+  pp_line " LICENSE file in the root directory of this source tree. An additional grant";
+  pp_line " of patent rights can be found in the PATENTS file in the same directory."
+
+let copyright_has_changed mono fb_year check_hash cstart cend lines_arr =
+  let old_copyright =
+    let r = ref "" in
+    for i = cstart to cend do
+      r := !r ^ lines_arr.(i) ^ "\n"
+    done;
+    !r in
+  let new_copyright =
+    let pp fmt () = pp_copyright mono fb_year check_hash fmt "" in
+    Utils.pp_to_string pp () in
+  old_copyright <> new_copyright
+
+let update_file fname mono fb_year check_hash cstart cend lines_arr =
+  try
+    let cout = open_out fname in
+    let fmt = F.formatter_of_out_channel cout in
+    for i = 0 to cstart - 1 do
+      F.fprintf fmt "%s@." lines_arr.(i)
+    done;
+    pp_copyright mono fb_year check_hash fmt "";
+    for i = cend + 1 to Array.length lines_arr - 1 do
+      F.fprintf fmt "%s@\n" lines_arr.(i)
+    done;
+    F.fprintf fmt "@?";
+    close_out cout
+  with _ -> ()
+
+let file_should_have_copyright fname lines =
+  let extensions =
+    [".ml"; ".mli"; ".ml"; ".mly"; ".java"; ".c";
+    ".h"; ".cpp"; ".m"; ".mm"; ".py"; ".sh"] in
+  list_exists (Filename.check_suffix fname) extensions
+
+
+let get_files_from_git () =
+  let tmpfile = Filename.temp_file "git_ls" "" in
+  let _ = Sys.command ("git ls-files >" ^ tmpfile) in
+  let git_files = match read_file tmpfile with
+    | Some git_files -> git_files
+    | None -> [] in
+  Sys.remove tmpfile;
+  git_files
+
+
+let check_copyright () =
+  let check_file fname =
+    match read_file fname with
+    | None -> ()
+    | Some lines ->
+        begin
+          match find_copyright_line lines 0 with
+          | None ->
+              if file_should_have_copyright fname lines
+              then L.stderr "Copyright not found in %s@." fname
+          | Some n ->
+              let lines_arr = Array.of_list lines in
+              let line = lines_arr.(n) in
+              let len = String.length line in
+              let check_hash = string_is_prefix "#" line in
+              let cstart = find_copyright_start lines_arr n check_hash in
+              let cend = find_copyright_end lines_arr n check_hash in
+              let range = cend - cstart in
+              if looks_like_copyright_message cstart cend lines_arr then
+                begin
+                  let mono = contains_monoidics cstart cend lines_arr in
+                  match get_fb_year cstart cend lines_arr with
+                  | None ->
+                      L.stderr "Can't find fb year: %s@." fname
+                  | Some fb_year ->
+                      if copyright_has_changed mono fb_year check_hash cstart cend lines_arr then
+                        begin
+                          L.stderr "%s (start:%d n:%d end:%d len:%d range:%d mono:%b year:%d)@."
+                            fname cstart n cend len range mono fb_year;
+                          for i = cstart to cend do
+                            L.stderr "  %s@." lines_arr.(i)
+                          done;
+                          L.stderr "-----@.";
+                          L.stderr "%a" (pp_copyright mono fb_year check_hash) "  ";
+                          if update_files then
+                            update_file fname mono fb_year check_hash cstart cend lines_arr
+                        end
+                end
+              else
+                L.stderr "Copyright not recognized: %s@." fname
+        end in
+  list_iter check_file (get_files_from_git ());
+  exit 0
+
+let check () =
+  if active then check_copyright ()
diff --git a/infer/src/backend/inferprint.ml b/infer/src/backend/inferprint.ml
index 3eb6b244d..e389a45b0 100644
--- a/infer/src/backend/inferprint.ml
+++ b/infer/src/backend/inferprint.ml
@@ -1,7 +1,11 @@
 (*
-* Copyright (c) 2009 -2013 Monoidics ltd.
-* Copyright (c) 2013 - Facebook.
+* Copyright (c) 2009 - 2013 Monoidics ltd.
+* Copyright (c) 2013 - present Facebook, Inc.
 * All rights reserved.
+*
+* This source code is licensed under the BSD style license found in the
+* LICENSE file in the root directory of this source tree. An additional grant
+* of patent rights can be found in the PATENTS file in the same directory.
 *)
 
 module L = Logging
@@ -208,7 +212,7 @@ let loc_trace_to_jsonbug_record trace_list ekind =
 let error_desc_to_qualifier_tags_records error_desc =
   let tag_value_pairs = Localise.error_desc_to_tag_value_pairs error_desc in
   let tag_value_to_record (tag, value) =
-    {tag = tag; value = value } in
+    { tag = tag; value = value } in
   list_map (fun tag_value -> tag_value_to_record tag_value) tag_value_pairs
 
 type summary_val =
diff --git a/infer/src/backend/sil.ml b/infer/src/backend/sil.ml
index e7c1f1843..6fc7138f0 100644
--- a/infer/src/backend/sil.ml
+++ b/infer/src/backend/sil.ml
@@ -10,6 +10,8 @@ module L = Logging
 module F = Format
 open Utils
 
+let () = if CheckCopyright.active then CheckCopyright.check ()
+
 (** {2 Programs and Types} *)
 
 (** Type to represent one @Annotation. *)
diff --git a/infer/src/backend/sil.mli b/infer/src/backend/sil.mli
index 3c8b49a2e..666207b27 100644
--- a/infer/src/backend/sil.mli
+++ b/infer/src/backend/sil.mli
@@ -1,7 +1,11 @@
 (*
-* Copyright (c) 2009 -2013 Monoidics ltd.
-* Copyright (c) 2013 - Facebook.
+* Copyright (c) 2009 - 2013 Monoidics ltd.
+* Copyright (c) 2013 - Present Facebook, Inc.
 * All rights reserved.
+*
+* This source code is licensed under the BSD - style license found in the
+* LICENSE file in the root directory of this source tree. An additional grant
+* of patent rights can be found in the PATENTS file in the same directory.
 *)
 
 (** The Smallfoot Intermediate Language *)
diff --git a/infer/src/backend/type_prop.ml b/infer/src/backend/type_prop.ml
index a213a47fa..1f6d07837 100644
--- a/infer/src/backend/type_prop.ml
+++ b/infer/src/backend/type_prop.ml
@@ -1,5 +1,12 @@
-(* * Copyright (c) 2009-2013 Monoidics ltd. * Copyright (c) 2013-          *)
-(* Facebook. * All rights reserved.                                        *)
+(*
+* Copyright (c) 2009 - 2013 Monoidics ltd.
+* Copyright (c) 2013 - Present Facebook, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the BSD - style license found in the
+* LICENSE file in the root directory of this source tree. An additional grant
+* of patent rights can be found in the PATENTS file in the same directory.
+*)
 
 (* Module for implementing an algorithm for propagating dynamic types. *)
 
diff --git a/infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java b/infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java
index d5fc642eb..b86a3802e 100644
--- a/infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java
+++ b/infer/tests/codetoanalyze/java/infer/CloseableAsResourceExample.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.infer;
 
diff --git a/infer/tests/codetoanalyze/java/infer/NeverNullSource.java b/infer/tests/codetoanalyze/java/infer/NeverNullSource.java
index 8dd248e8a..accce772f 100644
--- a/infer/tests/codetoanalyze/java/infer/NeverNullSource.java
+++ b/infer/tests/codetoanalyze/java/infer/NeverNullSource.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 // _AUTOMATICALLY_GENERATED_
 
 package codetoanalyze.java.infer;
diff --git a/infer/tests/codetoanalyze/java/infer/T.java b/infer/tests/codetoanalyze/java/infer/T.java
index 2e50377f6..f10111a0f 100644
--- a/infer/tests/codetoanalyze/java/infer/T.java
+++ b/infer/tests/codetoanalyze/java/infer/T.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.infer;
 
diff --git a/infer/tests/codetoanalyze/java/infer/Utils.java b/infer/tests/codetoanalyze/java/infer/Utils.java
index 023ec3ec2..75f100dbf 100644
--- a/infer/tests/codetoanalyze/java/infer/Utils.java
+++ b/infer/tests/codetoanalyze/java/infer/Utils.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.infer;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/ArrayIndexOutOfBoundsExceptionExample.java b/infer/tests/codetoanalyze/java/tracing/ArrayIndexOutOfBoundsExceptionExample.java
index 58811cfb3..7fc5ed051 100644
--- a/infer/tests/codetoanalyze/java/tracing/ArrayIndexOutOfBoundsExceptionExample.java
+++ b/infer/tests/codetoanalyze/java/tracing/ArrayIndexOutOfBoundsExceptionExample.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/ClassCastExceptionExample.java b/infer/tests/codetoanalyze/java/tracing/ClassCastExceptionExample.java
index 288d32ae0..6f3ce1aec 100644
--- a/infer/tests/codetoanalyze/java/tracing/ClassCastExceptionExample.java
+++ b/infer/tests/codetoanalyze/java/tracing/ClassCastExceptionExample.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/LocallyDefinedExceptionExample.java b/infer/tests/codetoanalyze/java/tracing/LocallyDefinedExceptionExample.java
index 03a52e8c2..effc5e24d 100644
--- a/infer/tests/codetoanalyze/java/tracing/LocallyDefinedExceptionExample.java
+++ b/infer/tests/codetoanalyze/java/tracing/LocallyDefinedExceptionExample.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/NullPointerExceptionExample.java b/infer/tests/codetoanalyze/java/tracing/NullPointerExceptionExample.java
index 228de1025..8af6a9d25 100644
--- a/infer/tests/codetoanalyze/java/tracing/NullPointerExceptionExample.java
+++ b/infer/tests/codetoanalyze/java/tracing/NullPointerExceptionExample.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/ReportOnMainExample.java b/infer/tests/codetoanalyze/java/tracing/ReportOnMainExample.java
index 38d70e2a3..f38c4f302 100644
--- a/infer/tests/codetoanalyze/java/tracing/ReportOnMainExample.java
+++ b/infer/tests/codetoanalyze/java/tracing/ReportOnMainExample.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/T.java b/infer/tests/codetoanalyze/java/tracing/T.java
index e137beb91..0982a491e 100644
--- a/infer/tests/codetoanalyze/java/tracing/T.java
+++ b/infer/tests/codetoanalyze/java/tracing/T.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/codetoanalyze/java/tracing/UnavoidableExceptionExample.java b/infer/tests/codetoanalyze/java/tracing/UnavoidableExceptionExample.java
index b3a6a4b56..e4af0dc82 100644
--- a/infer/tests/codetoanalyze/java/tracing/UnavoidableExceptionExample.java
+++ b/infer/tests/codetoanalyze/java/tracing/UnavoidableExceptionExample.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package codetoanalyze.java.tracing;
 
diff --git a/infer/tests/endtoend/java/comparison/ArrayIndexOutOfBoundsExceptionTest.java b/infer/tests/endtoend/java/comparison/ArrayIndexOutOfBoundsExceptionTest.java
index 2b5d09531..08db1929d 100644
--- a/infer/tests/endtoend/java/comparison/ArrayIndexOutOfBoundsExceptionTest.java
+++ b/infer/tests/endtoend/java/comparison/ArrayIndexOutOfBoundsExceptionTest.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package endtoend.java.comparison;
 
diff --git a/infer/tests/endtoend/java/comparison/ClassCastExceptionTest.java b/infer/tests/endtoend/java/comparison/ClassCastExceptionTest.java
index 62dc61c5a..e1f520266 100644
--- a/infer/tests/endtoend/java/comparison/ClassCastExceptionTest.java
+++ b/infer/tests/endtoend/java/comparison/ClassCastExceptionTest.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package endtoend.java.comparison;
 
diff --git a/infer/tests/endtoend/java/comparison/NullPointerExceptionTest.java b/infer/tests/endtoend/java/comparison/NullPointerExceptionTest.java
index 0ee109c0d..2768ce3cc 100644
--- a/infer/tests/endtoend/java/comparison/NullPointerExceptionTest.java
+++ b/infer/tests/endtoend/java/comparison/NullPointerExceptionTest.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package endtoend.java.comparison;
 
diff --git a/infer/tests/endtoend/java/infer/CloseableAsResourceTest.java b/infer/tests/endtoend/java/infer/CloseableAsResourceTest.java
index fd1dfed79..77988fd17 100644
--- a/infer/tests/endtoend/java/infer/CloseableAsResourceTest.java
+++ b/infer/tests/endtoend/java/infer/CloseableAsResourceTest.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package endtoend.java.infer;
 
diff --git a/infer/tests/endtoend/java/infer/IntegerClassTest.java b/infer/tests/endtoend/java/infer/IntegerClassTest.java
index 98907a9f6..d369e1051 100644
--- a/infer/tests/endtoend/java/infer/IntegerClassTest.java
+++ b/infer/tests/endtoend/java/infer/IntegerClassTest.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package endtoend.java.infer;
 
diff --git a/infer/tests/endtoend/java/tracing/ArrayIndexOutOfBoundsExceptionTest.java b/infer/tests/endtoend/java/tracing/ArrayIndexOutOfBoundsExceptionTest.java
index 094afd0c8..e87db923a 100644
--- a/infer/tests/endtoend/java/tracing/ArrayIndexOutOfBoundsExceptionTest.java
+++ b/infer/tests/endtoend/java/tracing/ArrayIndexOutOfBoundsExceptionTest.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package endtoend.java.tracing;
 
diff --git a/infer/tests/endtoend/java/tracing/ClassCastExceptionTest.java b/infer/tests/endtoend/java/tracing/ClassCastExceptionTest.java
index 1ce7b47bd..62e071cd4 100644
--- a/infer/tests/endtoend/java/tracing/ClassCastExceptionTest.java
+++ b/infer/tests/endtoend/java/tracing/ClassCastExceptionTest.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package endtoend.java.tracing;
 
diff --git a/infer/tests/endtoend/java/tracing/NullPointerExceptionTest.java b/infer/tests/endtoend/java/tracing/NullPointerExceptionTest.java
index a17643c31..33149c770 100644
--- a/infer/tests/endtoend/java/tracing/NullPointerExceptionTest.java
+++ b/infer/tests/endtoend/java/tracing/NullPointerExceptionTest.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package endtoend.java.tracing;
 
diff --git a/infer/tests/endtoend/java/tracing/ReportOnMainTest.java b/infer/tests/endtoend/java/tracing/ReportOnMainTest.java
index 0e747ef09..1f95db39e 100644
--- a/infer/tests/endtoend/java/tracing/ReportOnMainTest.java
+++ b/infer/tests/endtoend/java/tracing/ReportOnMainTest.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
 
 package endtoend.java.tracing;
 
diff --git a/infer/tests/endtoend/java/tracing/UnavoidableExceptionTest.java b/infer/tests/endtoend/java/tracing/UnavoidableExceptionTest.java
index fc909555b..a95cdd2e7 100644
--- a/infer/tests/endtoend/java/tracing/UnavoidableExceptionTest.java
+++ b/infer/tests/endtoend/java/tracing/UnavoidableExceptionTest.java
@@ -1,4 +1,8 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015-present Facebook.
+* All rights reserved.
+*/
+
 
 package endtoend.java.tracing;
 
diff --git a/infer/tests/utils/matchers/ResultContainsExactly.java b/infer/tests/utils/matchers/ResultContainsExactly.java
index fc609de74..2d152cc3b 100644
--- a/infer/tests/utils/matchers/ResultContainsExactly.java
+++ b/infer/tests/utils/matchers/ResultContainsExactly.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015 - present Facebook, Inc.
+* All rights reserved.
+*/
 
 package utils.matchers;
 
diff --git a/infer/tests/utils/matchers/ResultContainsTheseErrors.java b/infer/tests/utils/matchers/ResultContainsTheseErrors.java
index e1c468e4c..b6e76c175 100644
--- a/infer/tests/utils/matchers/ResultContainsTheseErrors.java
+++ b/infer/tests/utils/matchers/ResultContainsTheseErrors.java
@@ -1,4 +1,7 @@
-// Copyright (c) 2015-Present Facebook. All rights reserved.
+/*
+* Copyright (c) 2015 - present Facebook, Inc.
+* All rights reserved.
+*/
 
 package utils.matchers;
 
diff --git a/scripts/check_clang_plugin_version.sh b/scripts/check_clang_plugin_version.sh
index c0d29315c..b67fe77f1 100755
--- a/scripts/check_clang_plugin_version.sh
+++ b/scripts/check_clang_plugin_version.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 #
 # Copyright (c) 2014 - Facebook.  All rights reserved.
 #