--- a/ChangeLog	Thu Aug 06 02:13:19 2009 +0100
+++ b/ChangeLog	Thu Aug 06 09:38:51 2009 +0100
@@ -1,3 +1,13 @@
+2009-08-06  Andrew John Hughes  <ahughes@redhat.com>
+
+	* INSTALL:
+	Mention Shark requirements.
+	* NEWS:
+	Add release notes for 1.11.
+	* configure.ac:
+	Bump to 1.11 proper, remove duplicate
+	VisualVM/NetBeans macros.
+
 2009-08-05  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/INSTALL	Thu Aug 06 02:13:19 2009 +0100
+++ b/INSTALL	Thu Aug 06 09:38:51 2009 +0100
@@ -38,10 +38,9 @@
 For building VisualVM, you will need
 netbeans = 6.5
 
-For building VisualVM, you will need
-netbeans = 6.5
+For building the zero-assembler port (see below), you will need libffi.
 
-For building the zero-assembler port (see below), you will need libffi.
+For building the Shark JIT, you will need LLVM 2.5 or current SVN.
 
 For building with systemtap support (--enable-systemtap), you will need
 systemtap-sdt-devel (available since systemtap 0.9.5). This also needs

--- a/NEWS	Thu Aug 06 02:13:19 2009 +0100
+++ b/NEWS	Thu Aug 06 09:38:51 2009 +0100
@@ -1,3 +1,23 @@
+New in release 1.11 (2009-08-06)
+
+- Updated to OpenJDK7 b66 (Milestone 4), including
+  JSR 308: Annotations on Java types.
+- Updates/bug fixes for netx, Shark and the web plugin.
+- Zero is now provided in the upstream forest rather than in-tree.
+- The options
+  - --with-openjdk
+  - --with-icedtea
+  - --with-openjdk-home
+  - --with-icedtea-home
+  - --with-gcj-jdk
+  have been removed.  The JDK is now specified by --with-jdk-home
+  and whether or not do a full bootstrap or not is now decided
+  by --disable-bootstrap (the default is yes).  This is in preparation
+  for making the two stages independent of the JDK used, but some
+  artefacts still remain in this release; the supported behaviour
+  is still the use of gcj jdk for a full bootstrap and icedtea
+  for a quick build.
+
 New in release 1.10 (2009-05-29)
 
 - Updated to OpenJDK7 b59 build via IcedTea forest.  Now includes

--- a/configure.ac	Thu Aug 06 02:13:19 2009 +0100
+++ b/configure.ac	Thu Aug 06 09:38:51 2009 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [1.11-pre], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [1.11], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -65,24 +65,6 @@
 AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
 AC_SUBST(SYSTEM_NETBEANS_DIR)
 
-AC_MSG_CHECKING([for a NetBeans installation])
-AC_ARG_WITH([netbeans-home],
-           [AS_HELP_STRING([--with-netbeans-home],
-                            [NetBeans home directory (default is /usr/share/netbeans)])],
-            [
-              if test "x${withval}" = x
-              then
-                SYSTEM_NETBEANS_DIR=/usr/share/netbeans
-              else
-                SYSTEM_NETBEANS_DIR=${withval}
-              fi
-            ],
-            [
-              SYSTEM_NETBEANS_DIR=/usr/share/netbeans
-            ])
-AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
-AC_SUBST(SYSTEM_NETBEANS_DIR)
-
 AC_MSG_CHECKING(for Ant home directory)
 AC_ARG_WITH([ant-home],
             [AS_HELP_STRING([--with-ant-home],
@@ -109,14 +91,6 @@
 AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
 AC_MSG_RESULT(${enable_visualvm})
 
-AC_MSG_CHECKING(whether to build VisualVM)
-AC_ARG_ENABLE([visualvm],
-              [AS_HELP_STRING([--enable-visualvm],
-                                         [Enable compilation of visualvm.])],
-              [enable_visualvm="${enableval}"], [enable_visualvm="no"])
-AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
-AC_MSG_RESULT(${enable_visualvm})
-
 AC_MSG_CHECKING([whether to build the LiveConnect plugin])
 AC_ARG_ENABLE([plugin],
               [AS_HELP_STRING([--disable-plugin],