=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2011-05-02 22:53:34 +0000
+++ etc/ChangeLog	2011-05-03 00:45:58 +0000
@@ -1,3 +1,9 @@
+2011-05-03  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* NEWS: Mention new library gnutls.el and explain GnuTLS
+	functionality.  Mention new configure.bat options --without-gnutls
+	and --lib for W32.
+
 2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* NEWS: Mention `url-retrieve-queue', (:file "file") and

=== modified file 'etc/NEWS'
--- etc/NEWS	2011-05-02 22:53:34 +0000
+++ etc/NEWS	2011-05-03 00:43:31 +0000
@@ -903,7 +903,21 @@
 
 FIXME: These should be front-ended by xml.el.
 
-** FIXME GnuTLS
+** GnuTLS
+
+*** Emacs can be compiled with libgnutls support
+This is the default.  You will then be able to use the functionality
+in gnutls.el, namely the `open-gnutls-stream' and `gnutls-negotiate'
+functions.  It's easiest to use these functions through
+`open-network-stream' because it can upgrade connections through
+STARTTLS opportunistically or use plain SSL, depending on your needs.
+
+Only versions 2.8.x and higher or GnuTLS have been tested.
+
+*** gnutls-log-level
+Set `gnutls-log-level' higher than 0 to get debug output.  1 is for
+important messages, 2 is for debug data, and higher numbers are as per
+the GnuTLS logging conventions.  The output is in *Messages*.
 
 ** Isearch
 
@@ -931,6 +945,12 @@
 ** New configure.bat option --distfiles to specify files to be
 included in binary distribution.
 
+** New configure.bat option --without-gnutls to disable automatic
+GnuTLS detection.
+
+** New configure.bat option --lib for general library linkage, works
+with the USER_LIBS build variable.
+
 ** New make target `dist' to create binary distribution for MS Windows.