diff --git a/C/arith2.c b/C/arith2.c
index d3b11b8e9..4224b7a7f 100755
--- a/C/arith2.c
+++ b/C/arith2.c
@@ -674,7 +674,7 @@ p_gcd(Term t1, Term t2)
 	Int i1 = IntegerOfTerm(t1), i2 = IntegerOfTerm(t2);
 	i1 = (i1 >= 0 ? i1 : -i1);
 	i2 = (i2 >= 0 ? i2 : -i2);
-      
+
 	RINT(gcd(i1,i2));
       }
     case double_e:
@@ -965,7 +965,6 @@ static InitBinEntry InitBinTab[] = {
   {"\\/", op_or},
   {"#", op_xor},
   {"><", op_xor},
-  {"atan", op_atan2},
   {"atan2", op_atan2},
   /* C-Prolog exponentiation */
   {"^", op_power},
diff --git a/changes-6.0.html b/changes-6.0.html
index 2cee566ab..6c6235fad 100644
--- a/changes-6.0.html
+++ b/changes-6.0.html
@@ -17,7 +17,11 @@
 
 <h2>Yap-6.0.7:</h2>
 <ul>
-<li> FIXED: nothing yet.</li>
+<li> DELETE: atan/2 arithmetic function, use atan2/2 instead (WG17).</li>
+<li> FIXED: compilation in Solaris was broken because  of conflict in
+  declaration of gethostname.</li>
+<li> FIXED: acyclic_term/1 is now built-in (WG17).</li>
+<li> NEW: subsumes_term/2 (WG17).</li>
 </ul>
 
 <h2>Yap-6.0.6:</h2>
diff --git a/docs/yap.tex b/docs/yap.tex
index fd7c7a08f..325e5c7c4 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -3932,11 +3932,8 @@ Arc cosine.
 @item atan(@var{X}) [ISO]
 Arc tangent.
 
-@item atan(@var{X},@var{Y})
-Four-quadrant arc tangent.
-
 @item atan2(@var{X},@var{Y})
-Four-quadrant arc tangent, same as atan/2.
+Four-quadrant arc tangent.
 
 @item sinh(@var{X})
 Hyperbolic sine.
diff --git a/packages/clib/maildrop/rfc2045/rfc2045mkboundary.c b/packages/clib/maildrop/rfc2045/rfc2045mkboundary.c
index 427d6419b..04e137628 100644
--- a/packages/clib/maildrop/rfc2045/rfc2045mkboundary.c
+++ b/packages/clib/maildrop/rfc2045/rfc2045mkboundary.c
@@ -23,7 +23,7 @@
 
 /* $Id$ */
 
-#if	HAS_GETHOSTNAME
+#if	HAS_GETHOSTNAME||HAVE_GETHOSTNAME
 
 #else