3 files changed, 34 insertions, 3 deletions
diff --git a/lib/hipe/doc/src/HiPE_app.xml b/lib/hipe/doc/src/HiPE_app.xml
index 27fbf16fd0..ac6850387f 100644
--- a/lib/hipe/doc/src/HiPE_app.xml
+++ b/lib/hipe/doc/src/HiPE_app.xml
@@ -72,8 +72,7 @@
       </item>
 
       <tag>Stack traces</tag>
-      <item><p>Stack traces returned from <seemfa marker="erts:erlang#get_stacktrace/0">
-      <c>erlang:get_stacktrace/0</c></seemfa> or as part of <c>'EXIT'</c> terms
+      <item><p>Stack traces returned from <c>try</c>/<c>catch</c> or as part of <c>'EXIT'</c> terms
       can look incomplete if HiPE compiled functions are involved. Typically a stack trace
       will contain only BEAM compiled functions or only HiPE compiled functions, depending
       on where the exception was raised.</p>
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index f13551db83..1f9ab57727 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,6 +31,38 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 4.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a rare miss-compilation of tuple matching.</p>
+          <p>
+	    Own Id: OTP-16470</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The deprecated <c>erlang:get_stacktrace/0</c> BIF now
+	    returns an empty list instead of a stacktrace. To
+	    retrieve the stacktrace, use the extended try/catch
+	    syntax that was introduced in OTP 21.
+	    <c>erlang:get_stacktrace/0</c> is scheduled for removal
+	    in OTP 24.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-16484</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.19.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 5d34c61169..9a612e9063 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.19.3
+HIPE_VSN = 4.0