--- a/components/wireshark/wireshark.license	Tue Jul 24 10:14:00 2012 -0700
+++ b/components/wireshark/wireshark.license	Wed Jul 25 00:05:25 2012 -0700
@@ -314,10 +314,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -351,8 +350,7 @@
 Public License instead of this License.
 
 ------------------------------------------------------------------------
-Parts of Wireshark are covered by one or more of the following additional
-Notices:
+Parts of this software are licensed as follows
 
    Copyright (c) 1988, 1992, 1993
         The Regents of the University of California.  All rights reserved.