diff -u wmnetselect-0.85/wmnetselect.1x wmnetselect-0.85/wmnetselect.1x
--- wmnetselect-0.85/wmnetselect.1x
+++ wmnetselect-0.85/wmnetselect.1x
@@ -1,6 +1,6 @@
 .TH WMNETSELECT 1 "4 August 2000" 
 .SH NAME
-WMNETSELECT \- A dock applet to send the X selection to Iceweasel (or Iceape)
+WMNETSELECT \- A dock applet to send the X selection to Firefox (or Seamonkey)
 .SH SYNOPSIS
 .B wmnetselect
 [\-a <y|n>] [\-display <Display>] [\-e <program>] [\-h] [\-p <[+|\-]X[+|\-]Y>]
@@ -11,33 +11,33 @@
 .B wmnetselect
 is a Window Maker dock applet that makes all text on your X
 display internet-aware, sort of.  wmnetselect sends the X selection to
-Iceweasel (or Iceape) when you click on it. In other words, if you select
+Firefox (or Seamonkey) when you click on it. In other words, if you select
 this text:
 
    http://www.dpo.uab.edu/~grapeape/wmfaq.html
 
-and click the middle mouse button on wmnetselect, it will cause Iceweasel
-to load the web page at this URL. If Iceweasel is not running, wmnetselect
-will detect that, and launch Iceweasel, and then cause Iceweasel to load
+and click the middle mouse button on wmnetselect, it will cause Firefox
+to load the web page at this URL. If Firefox is not running, wmnetselect
+will detect that, and launch Firefox, and then cause Firefox to load
 the URL.
 
 If you select the text 
 .I apathos @ bham.net
 and click the middle mouse button on wmnetselect, it will start the 
-Iceweasel mail composer with the selected text in the 
+Firefox mail composer with the selected text in the 
 .I To:
 field.
 
-If Iceweasel has already been launched, you can open the URL in a new window
+If Firefox has already been launched, you can open the URL in a new window
 by Ctrl-clicking the middle button (hold down the control key and click the
 middle mouse button on wmnetselect).
 
-If you want to launch Iceweasel without sending it the X selection, double-click
+If you want to launch Firefox without sending it the X selection, double-click
 on wmnetselect with the left button, just like any other Window Maker docked
 appicon.
 
 A single left mouse button click while holding the Ctrl key will add the
-selected text as a bookmark if a Iceweasel window is open. If Iceweasel is
+selected text as a bookmark if a Firefox window is open. If Firefox is
 not open, the Ctrl-left button will open Mozilla to the selected text, but
 add no bookmark.
 
@@ -67,14 +67,14 @@
 .TP
 .B \-e <program>
 Specifies an executable name other than mozilla, (such as
-iceweasel) or specifies the full path name of an executable that is not in
+Firefox) or specifies the full path name of an executable that is not in
 your search path:
 
     wmnetselect \-e /usr/bin/mozilla
 
 If you want to pass parameters to the executable put them in quotes:
 
-    wmnetselect \-e "iceweasel \-safe\-mode"
+    wmnetselect \-e "firefox \-safe\-mode"
 
 .TP
 .B \-h
@@ -86,12 +86,12 @@
 .I @
 and doesn't
 contain any slashes (/), it is interpreted as an email address, and wmnetselect
-opens the Iceweasel mail composer with the selected text in the
+opens the Firefox mail composer with the selected text in the
 .I To:
 field.  Supplying a
 .B -i n
 option suppresses this behavior and supplies the selection
-to Iceweasel unaltered.  Defaults to
+to Firefox unaltered.  Defaults to
 .B y
 .TP
 .B -n
@@ -129,11 +129,11 @@
 .B n
 .TP
 .B \-s <y | n>
-Starts Iceweasel (by default) or the executable named in the
+Starts Firefox (by default) or the executable named in the
 .B -e
-option when wmnetselect is started. This can be used to start Iceweasel
+option when wmnetselect is started. This can be used to start Firefox
 when your window manager is started. This allows wmnetselect to better emulate
-a docked Iceweasel appicon.  Defaults to
+a docked Firefox appicon.  Defaults to
 .B y
 .TP
 .B \-w <search engine>
@@ -146,7 +146,7 @@
 .B \-v
 Displays the release version.
 .SH BUGS
-Ctrl-left button click does not add a bookmark if Iceweasel is not running.
+Ctrl-left button click does not add a bookmark if Firefox is not running.
 .SH AUTHORS             
 Patrick Hill <apathos@bham.net>
 .TP 
diff -u wmnetselect-0.85/debian/control wmnetselect-0.85/debian/control
--- wmnetselect-0.85/debian/control
+++ wmnetselect-0.85/debian/control
@@ -2,17 +2,18 @@
 Section: x11
 Priority: optional
 Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, x11proto-core-dev
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Standards-Version: 3.8.0
 
 Package: wmnetselect
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: iceweasel | iceape
-Description: enhanced Iceweasel launch button designed for WindowMaker
+Suggests: firefox | seakmonkey | iceweasel | iceape
+Description: enhanced Firefox launch button designed for WindowMaker
  This is a replacement for the Netscape/Mozilla launch button in your dock,
  that enhances the functionality of the button. You can use it just as you
- normally would to start Iceseasel. If you select an URL and paste it into
+ normally would to start Firefox. If you select an URL and paste it into
  the wmnetselect button, it will redirect netscape to that URL. Other
  features include quick Google.com searches and quick addition of URLs to
  your bookmarks.
diff -u wmnetselect-0.85/debian/changelog wmnetselect-0.85/debian/changelog
--- wmnetselect-0.85/debian/changelog
+++ wmnetselect-0.85/debian/changelog
@@ -1,3 +1,16 @@
+wmnetselect (0.85-6ubuntu1) intrepid; urgency=low
+
+  * Sync with Debian. (LP:# 258540) Remaining changes:
+  * debian/control:
+    - Modify Maintainer value to match the DebianMaintainerField specification.
+    - Add firefox | seamonkey to Suggests since we use firefox and seamonkey 
+      instead of iceweasel and iceape.
+  * wmnetselect.1x: Change all "Iceweasel" and "Iceape" to "Firefox" and 
+   "Seakmonkey" since we use firefox and seamonkey instead of iceweasel and 
+    iceape.
+
+ -- Stefan Ebner <sebner@ubuntu.com>  Mon, 18 Aug 2008 18:56:20 +0200
+
 wmnetselect (0.85-6) unstable; urgency=low
 
   * QA upload.