Blob Blame History Raw
diff --git a/frysk-common/EXCEPTION b/frysk-common/EXCEPTION
index 1c75271..5d97169 100644
--- a/frysk-common/EXCEPTION
+++ b/frysk-common/EXCEPTION
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index d5d7e74..11a83dc 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 9ba8775..e109084 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/TestRunner.java-in b/frysk-common/TestRunner.java-in
index b3f9eeb..4111b37 100755
--- a/frysk-common/TestRunner.java-in
+++ b/frysk-common/TestRunner.java-in
@@ -14,8 +14,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/antlr-warnings.awk b/frysk-common/antlr-warnings.awk
index 478dd53..6656fb7 100644
--- a/frysk-common/antlr-warnings.awk
+++ b/frysk-common/antlr-warnings.awk
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac
index c6893e5..8d7f837 100644
--- a/frysk-common/frysk-common.ac
+++ b/frysk-common/frysk-common.ac
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/frysk.xml-in b/frysk-common/frysk.xml-in
index ab94133..8d1b571 100644
--- a/frysk-common/frysk.xml-in
+++ b/frysk-common/frysk.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/javadocs.sh b/frysk-common/javadocs.sh
index 868167c..fa9b33f 100644
--- a/frysk-common/javadocs.sh
+++ b/frysk-common/javadocs.sh
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/ac_find_file.m4 b/frysk-common/m4/ac_find_file.m4
index 0dda752..022cb5e 100644
--- a/frysk-common/m4/ac_find_file.m4
+++ b/frysk-common/m4/ac_find_file.m4
@@ -12,8 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/ac_get_lib_line.m4 b/frysk-common/m4/ac_get_lib_line.m4
index d9c3f3f..46035df 100644
--- a/frysk-common/m4/ac_get_lib_line.m4
+++ b/frysk-common/m4/ac_get_lib_line.m4
@@ -12,8 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/frysk-use-libunwind.m4 b/frysk-common/m4/frysk-use-libunwind.m4
index e9b1526..67533aa 100644
--- a/frysk-common/m4/frysk-use-libunwind.m4
+++ b/frysk-common/m4/frysk-use-libunwind.m4
@@ -12,8 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/frysk_coverage.m4 b/frysk-common/m4/frysk_coverage.m4
index 2058947..5945cbd 100644
--- a/frysk-common/m4/frysk_coverage.m4
+++ b/frysk-common/m4/frysk_coverage.m4
@@ -13,8 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/frysk_do_arch32_test.m4 b/frysk-common/m4/frysk_do_arch32_test.m4
index bb2b257..6f8c2a1 100644
--- a/frysk-common/m4/frysk_do_arch32_test.m4
+++ b/frysk-common/m4/frysk_do_arch32_test.m4
@@ -12,8 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/frysk_find_jar.m4 b/frysk-common/m4/frysk_find_jar.m4
index f54b2f7..b86d8d1 100644
--- a/frysk-common/m4/frysk_find_jar.m4
+++ b/frysk-common/m4/frysk_find_jar.m4
@@ -12,8 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/frysk_pkg_module_variable.m4 b/frysk-common/m4/frysk_pkg_module_variable.m4
index a94fe5c..2b2e77c 100644
--- a/frysk-common/m4/frysk_pkg_module_variable.m4
+++ b/frysk-common/m4/frysk_pkg_module_variable.m4
@@ -12,8 +12,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/m4/frysk_werror.m4 b/frysk-common/m4/frysk_werror.m4
index 7f474b3..93e3a85 100644
--- a/frysk-common/m4/frysk_werror.m4
+++ b/frysk-common/m4/frysk_werror.m4
@@ -13,8 +13,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 #
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh
index 11658a7..c5385bb 100755
--- a/frysk-common/manpages.sh
+++ b/frysk-common/manpages.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-common/version.ac b/frysk-common/version.ac
index 1ad5c01..0bd0fc0 100644
--- a/frysk-common/version.ac
+++ b/frysk-common/version.ac
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am
index 94deefa..a898651 100644
--- a/frysk-core/Makefile.am
+++ b/frysk-core/Makefile.am
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/bootstrap.sh b/frysk-core/bootstrap.sh
index ffb62a8..3042913 100755
--- a/frysk-core/bootstrap.sh
+++ b/frysk-core/bootstrap.sh
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/configure.ac b/frysk-core/configure.ac
index 065bc52..49bab9a 100644
--- a/frysk-core/configure.ac
+++ b/frysk-core/configure.ac
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestDebugdump.java b/frysk-core/frysk/bindir/TestDebugdump.java
index f0637ea..5160086 100644
--- a/frysk-core/frysk/bindir/TestDebugdump.java
+++ b/frysk-core/frysk/bindir/TestDebugdump.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFauxv.java b/frysk-core/frysk/bindir/TestFauxv.java
index b03aba3..7924281 100644
--- a/frysk-core/frysk/bindir/TestFauxv.java
+++ b/frysk-core/frysk/bindir/TestFauxv.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFcatch.java b/frysk-core/frysk/bindir/TestFcatch.java
index 6d6f694..ba2e98b 100644
--- a/frysk-core/frysk/bindir/TestFcatch.java
+++ b/frysk-core/frysk/bindir/TestFcatch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFcore.java b/frysk-core/frysk/bindir/TestFcore.java
index b54a173..c7317f4 100644
--- a/frysk-core/frysk/bindir/TestFcore.java
+++ b/frysk-core/frysk/bindir/TestFcore.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFdebuginfo.java b/frysk-core/frysk/bindir/TestFdebuginfo.java
index d6a2d97..c772415 100644
--- a/frysk-core/frysk/bindir/TestFdebuginfo.java
+++ b/frysk-core/frysk/bindir/TestFdebuginfo.java
@@ -12,8 +12,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFerror.java b/frysk-core/frysk/bindir/TestFerror.java
index f77f9e2..71bf82f 100644
--- a/frysk-core/frysk/bindir/TestFerror.java
+++ b/frysk-core/frysk/bindir/TestFerror.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFexe.java b/frysk-core/frysk/bindir/TestFexe.java
index 5a37447..07286fd 100644
--- a/frysk-core/frysk/bindir/TestFexe.java
+++ b/frysk-core/frysk/bindir/TestFexe.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFhpd.java b/frysk-core/frysk/bindir/TestFhpd.java
index 1464938..4a7943a 100755
--- a/frysk-core/frysk/bindir/TestFhpd.java
+++ b/frysk-core/frysk/bindir/TestFhpd.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFmaps.java b/frysk-core/frysk/bindir/TestFmaps.java
index 1717c3f..21ffbf6 100644
--- a/frysk-core/frysk/bindir/TestFmaps.java
+++ b/frysk-core/frysk/bindir/TestFmaps.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFstack.java b/frysk-core/frysk/bindir/TestFstack.java
index 952f12d..de51369 100644
--- a/frysk-core/frysk/bindir/TestFstack.java
+++ b/frysk-core/frysk/bindir/TestFstack.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFstep.java b/frysk-core/frysk/bindir/TestFstep.java
index 3503cd7..8ff2b36 100644
--- a/frysk-core/frysk/bindir/TestFstep.java
+++ b/frysk-core/frysk/bindir/TestFstep.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/TestFtrace.java b/frysk-core/frysk/bindir/TestFtrace.java
index 5c67487..592311e 100644
--- a/frysk-core/frysk/bindir/TestFtrace.java
+++ b/frysk-core/frysk/bindir/TestFtrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fauxv.java b/frysk-core/frysk/bindir/fauxv.java
index 8afa404..83736d6 100644
--- a/frysk-core/frysk/bindir/fauxv.java
+++ b/frysk-core/frysk/bindir/fauxv.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fauxv.xml-in b/frysk-core/frysk/bindir/fauxv.xml-in
index 669e06e..1ce8391 100644
--- a/frysk-core/frysk/bindir/fauxv.xml-in
+++ b/frysk-core/frysk/bindir/fauxv.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fcatch.java b/frysk-core/frysk/bindir/fcatch.java
index cb7f6c2..5a2a147 100644
--- a/frysk-core/frysk/bindir/fcatch.java
+++ b/frysk-core/frysk/bindir/fcatch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fcatch.xml-in b/frysk-core/frysk/bindir/fcatch.xml-in
index 52dd1df..f78408f 100644
--- a/frysk-core/frysk/bindir/fcatch.xml-in
+++ b/frysk-core/frysk/bindir/fcatch.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fcore.java b/frysk-core/frysk/bindir/fcore.java
index dac7776..c12ebd9 100644
--- a/frysk-core/frysk/bindir/fcore.java
+++ b/frysk-core/frysk/bindir/fcore.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fcore.xml-in b/frysk-core/frysk/bindir/fcore.xml-in
index bcc705f..fb7b7c3 100644
--- a/frysk-core/frysk/bindir/fcore.xml-in
+++ b/frysk-core/frysk/bindir/fcore.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fdebugdump.xml-in b/frysk-core/frysk/bindir/fdebugdump.xml-in
index f393c9c..14ecfee 100644
--- a/frysk-core/frysk/bindir/fdebugdump.xml-in
+++ b/frysk-core/frysk/bindir/fdebugdump.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fdebuginfo.java b/frysk-core/frysk/bindir/fdebuginfo.java
index bdc850a..d8c279d 100644
--- a/frysk-core/frysk/bindir/fdebuginfo.java
+++ b/frysk-core/frysk/bindir/fdebuginfo.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fdebuginfo.xml-in b/frysk-core/frysk/bindir/fdebuginfo.xml-in
index 8f88f0b..ea4dd7b 100644
--- a/frysk-core/frysk/bindir/fdebuginfo.xml-in
+++ b/frysk-core/frysk/bindir/fdebuginfo.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fdebugrpm.sh b/frysk-core/frysk/bindir/fdebugrpm.sh
index dc7ccfb..e78e3d5 100644
--- a/frysk-core/frysk/bindir/fdebugrpm.sh
+++ b/frysk-core/frysk/bindir/fdebugrpm.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fdebugrpm.xml-in b/frysk-core/frysk/bindir/fdebugrpm.xml-in
index 6ae5dfd..b8e50bc 100644
--- a/frysk-core/frysk/bindir/fdebugrpm.xml-in
+++ b/frysk-core/frysk/bindir/fdebugrpm.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/ferror.java b/frysk-core/frysk/bindir/ferror.java
index 3592edd..f4fa566 100644
--- a/frysk-core/frysk/bindir/ferror.java
+++ b/frysk-core/frysk/bindir/ferror.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/ferror.xml-in b/frysk-core/frysk/bindir/ferror.xml-in
index b8742b6..30d2523 100644
--- a/frysk-core/frysk/bindir/ferror.xml-in
+++ b/frysk-core/frysk/bindir/ferror.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fexe.java b/frysk-core/frysk/bindir/fexe.java
index 644133e..b4f8655 100644
--- a/frysk-core/frysk/bindir/fexe.java
+++ b/frysk-core/frysk/bindir/fexe.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fexe.xml-in b/frysk-core/frysk/bindir/fexe.xml-in
index 2c7a4c7..995e061 100644
--- a/frysk-core/frysk/bindir/fexe.xml-in
+++ b/frysk-core/frysk/bindir/fexe.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fhpd.java b/frysk-core/frysk/bindir/fhpd.java
index fcf965f..3738a2c 100644
--- a/frysk-core/frysk/bindir/fhpd.java
+++ b/frysk-core/frysk/bindir/fhpd.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fhpd.xml-in b/frysk-core/frysk/bindir/fhpd.xml-in
index 255e209..859893b 100644
--- a/frysk-core/frysk/bindir/fhpd.xml-in
+++ b/frysk-core/frysk/bindir/fhpd.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fmaps.java b/frysk-core/frysk/bindir/fmaps.java
index a718c3e..3a283e7 100644
--- a/frysk-core/frysk/bindir/fmaps.java
+++ b/frysk-core/frysk/bindir/fmaps.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fmaps.xml-in b/frysk-core/frysk/bindir/fmaps.xml-in
index de7a3dd..c2d9a7f 100644
--- a/frysk-core/frysk/bindir/fmaps.xml-in
+++ b/frysk-core/frysk/bindir/fmaps.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fstack.java b/frysk-core/frysk/bindir/fstack.java
index 6e44a29..a945fca 100644
--- a/frysk-core/frysk/bindir/fstack.java
+++ b/frysk-core/frysk/bindir/fstack.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fstack.xml-in b/frysk-core/frysk/bindir/fstack.xml-in
index 561593f..b5f2566 100644
--- a/frysk-core/frysk/bindir/fstack.xml-in
+++ b/frysk-core/frysk/bindir/fstack.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fstep.java b/frysk-core/frysk/bindir/fstep.java
index a32fbca..2c50f55 100644
--- a/frysk-core/frysk/bindir/fstep.java
+++ b/frysk-core/frysk/bindir/fstep.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/fstep.xml-in b/frysk-core/frysk/bindir/fstep.xml-in
index ba00071..4fe4efe 100644
--- a/frysk-core/frysk/bindir/fstep.xml-in
+++ b/frysk-core/frysk/bindir/fstep.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/ftrace.java b/frysk-core/frysk/bindir/ftrace.java
index 34baff7..f4349a5 100644
--- a/frysk-core/frysk/bindir/ftrace.java
+++ b/frysk-core/frysk/bindir/ftrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/bindir/ftrace.xml-in b/frysk-core/frysk/bindir/ftrace.xml-in
index 22ad3a5..4ac6a3f 100644
--- a/frysk-core/frysk/bindir/ftrace.xml-in
+++ b/frysk-core/frysk/bindir/ftrace.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/CompilerVersion.java b/frysk-core/frysk/debuginfo/CompilerVersion.java
index 8b174c0..8f18822 100644
--- a/frysk-core/frysk/debuginfo/CompilerVersion.java
+++ b/frysk-core/frysk/debuginfo/CompilerVersion.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/CompilerVersionFactory.java b/frysk-core/frysk/debuginfo/CompilerVersionFactory.java
index da0317a..e5ffdde 100644
--- a/frysk-core/frysk/debuginfo/CompilerVersionFactory.java
+++ b/frysk-core/frysk/debuginfo/CompilerVersionFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/DebugInfo.java b/frysk-core/frysk/debuginfo/DebugInfo.java
index f4889fb..2fd6bb6 100644
--- a/frysk-core/frysk/debuginfo/DebugInfo.java
+++ b/frysk-core/frysk/debuginfo/DebugInfo.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
index abc62fc..c25fd80 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/DebugInfoStackFactory.java b/frysk-core/frysk/debuginfo/DebugInfoStackFactory.java
index 4adec65..8071513 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoStackFactory.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoStackFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/DwarfRegisterMapFactory.java b/frysk-core/frysk/debuginfo/DwarfRegisterMapFactory.java
index 1c08493..2f74175 100644
--- a/frysk-core/frysk/debuginfo/DwarfRegisterMapFactory.java
+++ b/frysk-core/frysk/debuginfo/DwarfRegisterMapFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/GNURedHatCompilerVersion.java b/frysk-core/frysk/debuginfo/GNURedHatCompilerVersion.java
index 2853155..880f272 100644
--- a/frysk-core/frysk/debuginfo/GNURedHatCompilerVersion.java
+++ b/frysk-core/frysk/debuginfo/GNURedHatCompilerVersion.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/LocationExpression.java b/frysk-core/frysk/debuginfo/LocationExpression.java
index 7695f2f..7328136 100644
--- a/frysk-core/frysk/debuginfo/LocationExpression.java
+++ b/frysk-core/frysk/debuginfo/LocationExpression.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/MemoryPiece.java b/frysk-core/frysk/debuginfo/MemoryPiece.java
index ddbccd9..7cedb7b 100644
--- a/frysk-core/frysk/debuginfo/MemoryPiece.java
+++ b/frysk-core/frysk/debuginfo/MemoryPiece.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/ObjectDeclarationNotFoundException.java b/frysk-core/frysk/debuginfo/ObjectDeclarationNotFoundException.java
index 0f0b0c2..9952353 100644
--- a/frysk-core/frysk/debuginfo/ObjectDeclarationNotFoundException.java
+++ b/frysk-core/frysk/debuginfo/ObjectDeclarationNotFoundException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java
index d85815d..8a4e385 100644
--- a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java
+++ b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/Piece.java b/frysk-core/frysk/debuginfo/Piece.java
index 12790be..1de1001 100644
--- a/frysk-core/frysk/debuginfo/Piece.java
+++ b/frysk-core/frysk/debuginfo/Piece.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/PieceLocation.java b/frysk-core/frysk/debuginfo/PieceLocation.java
index d636a6a..be7815f 100644
--- a/frysk-core/frysk/debuginfo/PieceLocation.java
+++ b/frysk-core/frysk/debuginfo/PieceLocation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/PrintDebugInfoStackOptions.java b/frysk-core/frysk/debuginfo/PrintDebugInfoStackOptions.java
index 486eae3..e5670a3 100644
--- a/frysk-core/frysk/debuginfo/PrintDebugInfoStackOptions.java
+++ b/frysk-core/frysk/debuginfo/PrintDebugInfoStackOptions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/RegisterPiece.java b/frysk-core/frysk/debuginfo/RegisterPiece.java
index fc3c90e..7ff841b 100644
--- a/frysk-core/frysk/debuginfo/RegisterPiece.java
+++ b/frysk-core/frysk/debuginfo/RegisterPiece.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestAddress.java b/frysk-core/frysk/debuginfo/TestAddress.java
index d0626ea..572b261 100644
--- a/frysk-core/frysk/debuginfo/TestAddress.java
+++ b/frysk-core/frysk/debuginfo/TestAddress.java
@@ -12,8 +12,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
index 9f1d953..c803bdc 100644
--- a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
+++ b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
index 74eead7..1e41e62 100644
--- a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
+++ b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestGccClass.java b/frysk-core/frysk/debuginfo/TestGccClass.java
index e3e6ee6..f669706 100644
--- a/frysk-core/frysk/debuginfo/TestGccClass.java
+++ b/frysk-core/frysk/debuginfo/TestGccClass.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestGccInterface.java b/frysk-core/frysk/debuginfo/TestGccInterface.java
index 35873b6..a2b09c6 100644
--- a/frysk-core/frysk/debuginfo/TestGccInterface.java
+++ b/frysk-core/frysk/debuginfo/TestGccInterface.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestLocationExpression.java b/frysk-core/frysk/debuginfo/TestLocationExpression.java
index d1e1a75..2a03483 100644
--- a/frysk-core/frysk/debuginfo/TestLocationExpression.java
+++ b/frysk-core/frysk/debuginfo/TestLocationExpression.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
index 8f12815..fdf1f6d 100644
--- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
+++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngineTopDown.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngineTopDown.java
index b781651..994dbea 100644
--- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngineTopDown.java
+++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngineTopDown.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestPieceLocation.java b/frysk-core/frysk/debuginfo/TestPieceLocation.java
index 964d878..9a834f1 100644
--- a/frysk-core/frysk/debuginfo/TestPieceLocation.java
+++ b/frysk-core/frysk/debuginfo/TestPieceLocation.java
@@ -12,8 +12,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh
index e07b682..11e51ed 100644
--- a/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh
+++ b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/TypeFactory.java b/frysk-core/frysk/debuginfo/TypeFactory.java
index c0a4f69..26bcb31 100644
--- a/frysk-core/frysk/debuginfo/TypeFactory.java
+++ b/frysk-core/frysk/debuginfo/TypeFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/UnavailablePiece.java b/frysk-core/frysk/debuginfo/UnavailablePiece.java
index 506f5ce..9ab12c8 100644
--- a/frysk-core/frysk/debuginfo/UnavailablePiece.java
+++ b/frysk-core/frysk/debuginfo/UnavailablePiece.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/ValueUnavailableException.java b/frysk-core/frysk/debuginfo/ValueUnavailableException.java
index a0fe8b2..77144dc 100644
--- a/frysk-core/frysk/debuginfo/ValueUnavailableException.java
+++ b/frysk-core/frysk/debuginfo/ValueUnavailableException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/VariableOptimizedOutException.java b/frysk-core/frysk/debuginfo/VariableOptimizedOutException.java
index e380e69..362e3be 100644
--- a/frysk-core/frysk/debuginfo/VariableOptimizedOutException.java
+++ b/frysk-core/frysk/debuginfo/VariableOptimizedOutException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java b/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java
index 7fb6039..5eb5c1c 100644
--- a/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/VirtualDebugInfoFrame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
index 0daf18a..6163edc 100644
--- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
+++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/DwflCache.java b/frysk-core/frysk/dwfl/DwflCache.java
index 4825f94..40617f9 100644
--- a/frysk-core/frysk/dwfl/DwflCache.java
+++ b/frysk-core/frysk/dwfl/DwflCache.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/DwflFactory.java b/frysk-core/frysk/dwfl/DwflFactory.java
index eabb0c6..d9e52fa 100644
--- a/frysk-core/frysk/dwfl/DwflFactory.java
+++ b/frysk-core/frysk/dwfl/DwflFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/ElfSectionCache.java b/frysk-core/frysk/dwfl/ElfSectionCache.java
index b4d77f5..79569e6 100644
--- a/frysk-core/frysk/dwfl/ElfSectionCache.java
+++ b/frysk-core/frysk/dwfl/ElfSectionCache.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/ObjectFile.java b/frysk-core/frysk/dwfl/ObjectFile.java
index 914e050..9c19670 100644
--- a/frysk-core/frysk/dwfl/ObjectFile.java
+++ b/frysk-core/frysk/dwfl/ObjectFile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/TestDwfl.java b/frysk-core/frysk/dwfl/TestDwfl.java
index 3d56b11..198a2ac 100644
--- a/frysk-core/frysk/dwfl/TestDwfl.java
+++ b/frysk-core/frysk/dwfl/TestDwfl.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/TestDwflCache.java b/frysk-core/frysk/dwfl/TestDwflCache.java
index d037994..bc18601 100644
--- a/frysk-core/frysk/dwfl/TestDwflCache.java
+++ b/frysk-core/frysk/dwfl/TestDwflCache.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/dwfl/TestElfSectionCache.java b/frysk-core/frysk/dwfl/TestElfSectionCache.java
index 729b28b..aaa8253 100644
--- a/frysk-core/frysk/dwfl/TestElfSectionCache.java
+++ b/frysk-core/frysk/dwfl/TestElfSectionCache.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/ActionPointEvent.java b/frysk-core/frysk/event/ActionPointEvent.java
index 6b99e48..406cc11 100644
--- a/frysk-core/frysk/event/ActionPointEvent.java
+++ b/frysk-core/frysk/event/ActionPointEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/Event.java b/frysk-core/frysk/event/Event.java
index 39a25f4..9876a1a 100644
--- a/frysk-core/frysk/event/Event.java
+++ b/frysk-core/frysk/event/Event.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/EventLoop.java b/frysk-core/frysk/event/EventLoop.java
index e70573a..abcf494 100644
--- a/frysk-core/frysk/event/EventLoop.java
+++ b/frysk-core/frysk/event/EventLoop.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/EventLoopTestBed.java b/frysk-core/frysk/event/EventLoopTestBed.java
index a745e38..4ab1a1c 100644
--- a/frysk-core/frysk/event/EventLoopTestBed.java
+++ b/frysk-core/frysk/event/EventLoopTestBed.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/PollEvent.java b/frysk-core/frysk/event/PollEvent.java
index d842473..66324f8 100644
--- a/frysk-core/frysk/event/PollEvent.java
+++ b/frysk-core/frysk/event/PollEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/PollEventLoop.java b/frysk-core/frysk/event/PollEventLoop.java
index 31a09be..a5f0009 100644
--- a/frysk-core/frysk/event/PollEventLoop.java
+++ b/frysk-core/frysk/event/PollEventLoop.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/ProcEvent.java b/frysk-core/frysk/event/ProcEvent.java
index bf7aac2..b894a10 100644
--- a/frysk-core/frysk/event/ProcEvent.java
+++ b/frysk-core/frysk/event/ProcEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/Request.java b/frysk-core/frysk/event/Request.java
index 3374eac..92301db 100644
--- a/frysk-core/frysk/event/Request.java
+++ b/frysk-core/frysk/event/Request.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/RequestStopEvent.java b/frysk-core/frysk/event/RequestStopEvent.java
index 0fbaa5e..b5fd035 100644
--- a/frysk-core/frysk/event/RequestStopEvent.java
+++ b/frysk-core/frysk/event/RequestStopEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/SignalEvent.java b/frysk-core/frysk/event/SignalEvent.java
index f8cc4c3..935c816 100644
--- a/frysk-core/frysk/event/SignalEvent.java
+++ b/frysk-core/frysk/event/SignalEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/TestPollEventLoop.java b/frysk-core/frysk/event/TestPollEventLoop.java
index a4c0567..fd5c1bb 100644
--- a/frysk-core/frysk/event/TestPollEventLoop.java
+++ b/frysk-core/frysk/event/TestPollEventLoop.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/TestSigChild.java b/frysk-core/frysk/event/TestSigChild.java
index 117048a..b77013e 100644
--- a/frysk-core/frysk/event/TestSigChild.java
+++ b/frysk-core/frysk/event/TestSigChild.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/TestWaitEventLoop.java b/frysk-core/frysk/event/TestWaitEventLoop.java
index 5472cec..01ce3c7 100644
--- a/frysk-core/frysk/event/TestWaitEventLoop.java
+++ b/frysk-core/frysk/event/TestWaitEventLoop.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/TimerEvent.java b/frysk-core/frysk/event/TimerEvent.java
index 29c59f1..0e609be 100644
--- a/frysk-core/frysk/event/TimerEvent.java
+++ b/frysk-core/frysk/event/TimerEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/event/WaitEventLoop.java b/frysk-core/frysk/event/WaitEventLoop.java
index 0bd8cf4..008cae9 100644
--- a/frysk-core/frysk/event/WaitEventLoop.java
+++ b/frysk-core/frysk/event/WaitEventLoop.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/CExpr.g b/frysk-core/frysk/expr/CExpr.g
index 2654a89..f4f1b33 100644
--- a/frysk-core/frysk/expr/CExpr.g
+++ b/frysk-core/frysk/expr/CExpr.g
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
@@ -54,8 +53,7 @@ header
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/CExprEvaluator.g b/frysk-core/frysk/expr/CExprEvaluator.g
index 1aafee4..962f461 100644
--- a/frysk-core/frysk/expr/CExprEvaluator.g
+++ b/frysk-core/frysk/expr/CExprEvaluator.g
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
@@ -54,8 +53,7 @@ header
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/CTypeEvaluator.g b/frysk-core/frysk/expr/CTypeEvaluator.g
index 010f22d..0f9a51f 100644
--- a/frysk-core/frysk/expr/CTypeEvaluator.g
+++ b/frysk-core/frysk/expr/CTypeEvaluator.g
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
@@ -54,8 +53,7 @@ header
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/CompletionException.java b/frysk-core/frysk/expr/CompletionException.java
index c239f2b..1d79249 100644
--- a/frysk-core/frysk/expr/CompletionException.java
+++ b/frysk-core/frysk/expr/CompletionException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/DetailedAST.java b/frysk-core/frysk/expr/DetailedAST.java
index bfe069a..f645039 100644
--- a/frysk-core/frysk/expr/DetailedAST.java
+++ b/frysk-core/frysk/expr/DetailedAST.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/ExprSearchEngine.java b/frysk-core/frysk/expr/ExprSearchEngine.java
index 3bb85a6..a7c2ab9 100644
--- a/frysk-core/frysk/expr/ExprSearchEngine.java
+++ b/frysk-core/frysk/expr/ExprSearchEngine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/ExprSymTab.java b/frysk-core/frysk/expr/ExprSymTab.java
index cd97770..012c962 100644
--- a/frysk-core/frysk/expr/ExprSymTab.java
+++ b/frysk-core/frysk/expr/ExprSymTab.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/Expression.java b/frysk-core/frysk/expr/Expression.java
index 843498b..ecc7e58 100644
--- a/frysk-core/frysk/expr/Expression.java
+++ b/frysk-core/frysk/expr/Expression.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/ExpressionFactory.java b/frysk-core/frysk/expr/ExpressionFactory.java
index d2d325d..dcf9640 100644
--- a/frysk-core/frysk/expr/ExpressionFactory.java
+++ b/frysk-core/frysk/expr/ExpressionFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentParser.java b/frysk-core/frysk/expr/FQIdentParser.java
index 2aa9ce2..6c4191e 100644
--- a/frysk-core/frysk/expr/FQIdentParser.java
+++ b/frysk-core/frysk/expr/FQIdentParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentPattern.java b/frysk-core/frysk/expr/FQIdentPattern.java
index 03e0605..fecb61b 100644
--- a/frysk-core/frysk/expr/FQIdentPattern.java
+++ b/frysk-core/frysk/expr/FQIdentPattern.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentPatternAll.java b/frysk-core/frysk/expr/FQIdentPatternAll.java
index 4e2ad9e..92af9cf 100644
--- a/frysk-core/frysk/expr/FQIdentPatternAll.java
+++ b/frysk-core/frysk/expr/FQIdentPatternAll.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentPatternExact.java b/frysk-core/frysk/expr/FQIdentPatternExact.java
index 8cdc75f..cefe38e 100644
--- a/frysk-core/frysk/expr/FQIdentPatternExact.java
+++ b/frysk-core/frysk/expr/FQIdentPatternExact.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentPatternGlob.java b/frysk-core/frysk/expr/FQIdentPatternGlob.java
index 918f11e..2717c28 100644
--- a/frysk-core/frysk/expr/FQIdentPatternGlob.java
+++ b/frysk-core/frysk/expr/FQIdentPatternGlob.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentToken.java b/frysk-core/frysk/expr/FQIdentToken.java
index 81a56ec..79c2b9c 100644
--- a/frysk-core/frysk/expr/FQIdentToken.java
+++ b/frysk-core/frysk/expr/FQIdentToken.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/FQIdentifier.java b/frysk-core/frysk/expr/FQIdentifier.java
index e73fbbe..8a58dd4 100644
--- a/frysk-core/frysk/expr/FQIdentifier.java
+++ b/frysk-core/frysk/expr/FQIdentifier.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/IncompleteIdentifierException.java b/frysk-core/frysk/expr/IncompleteIdentifierException.java
index 30afa28..5078c0e 100644
--- a/frysk-core/frysk/expr/IncompleteIdentifierException.java
+++ b/frysk-core/frysk/expr/IncompleteIdentifierException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/IncompleteMemberException.java b/frysk-core/frysk/expr/IncompleteMemberException.java
index e7e585e..b5eceaa 100644
--- a/frysk-core/frysk/expr/IncompleteMemberException.java
+++ b/frysk-core/frysk/expr/IncompleteMemberException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/IncompleteScopeException.java b/frysk-core/frysk/expr/IncompleteScopeException.java
index 8ee069b..c4087a6 100644
--- a/frysk-core/frysk/expr/IncompleteScopeException.java
+++ b/frysk-core/frysk/expr/IncompleteScopeException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/IncompleteTokenException.java b/frysk-core/frysk/expr/IncompleteTokenException.java
index f5c8675..5169348 100644
--- a/frysk-core/frysk/expr/IncompleteTokenException.java
+++ b/frysk-core/frysk/expr/IncompleteTokenException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/ScratchSymTab.java b/frysk-core/frysk/expr/ScratchSymTab.java
index 2f447aa..1294522 100644
--- a/frysk-core/frysk/expr/ScratchSymTab.java
+++ b/frysk-core/frysk/expr/ScratchSymTab.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/SyntaxException.java b/frysk-core/frysk/expr/SyntaxException.java
index 1161c40..e71a1d5 100644
--- a/frysk-core/frysk/expr/SyntaxException.java
+++ b/frysk-core/frysk/expr/SyntaxException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/TestArithmetics.java b/frysk-core/frysk/expr/TestArithmetics.java
index 7cd9b2a..04f7989 100644
--- a/frysk-core/frysk/expr/TestArithmetics.java
+++ b/frysk-core/frysk/expr/TestArithmetics.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/TestCompletion.java b/frysk-core/frysk/expr/TestCompletion.java
index 7586ea3..63a13da 100644
--- a/frysk-core/frysk/expr/TestCompletion.java
+++ b/frysk-core/frysk/expr/TestCompletion.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/expr/TestbedSymTab.java b/frysk-core/frysk/expr/TestbedSymTab.java
index 2447706..b89051d 100644
--- a/frysk-core/frysk/expr/TestbedSymTab.java
+++ b/frysk-core/frysk/expr/TestbedSymTab.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/AddrRule.java b/frysk-core/frysk/ftrace/AddrRule.java
index 5718800..c8f318e 100644
--- a/frysk-core/frysk/ftrace/AddrRule.java
+++ b/frysk-core/frysk/ftrace/AddrRule.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/Arch.java b/frysk-core/frysk/ftrace/Arch.java
index 6b27d57..ec0be83 100644
--- a/frysk-core/frysk/ftrace/Arch.java
+++ b/frysk-core/frysk/ftrace/Arch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/ArchFactory.java b/frysk-core/frysk/ftrace/ArchFactory.java
index d87354b..3a672e4 100644
--- a/frysk-core/frysk/ftrace/ArchFactory.java
+++ b/frysk-core/frysk/ftrace/ArchFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/Ftrace.java b/frysk-core/frysk/ftrace/Ftrace.java
index b19c39e..9ae2b6c 100644
--- a/frysk-core/frysk/ftrace/Ftrace.java
+++ b/frysk-core/frysk/ftrace/Ftrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/FtraceController.java b/frysk-core/frysk/ftrace/FtraceController.java
index 1eb9ff9..b226550 100644
--- a/frysk-core/frysk/ftrace/FtraceController.java
+++ b/frysk-core/frysk/ftrace/FtraceController.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/IA32Arch.java b/frysk-core/frysk/ftrace/IA32Arch.java
index 6a0ffb5..21e4aa0 100644
--- a/frysk-core/frysk/ftrace/IA32Arch.java
+++ b/frysk-core/frysk/ftrace/IA32Arch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/MappingGuard.java b/frysk-core/frysk/ftrace/MappingGuard.java
index 98e165d..1cef4c7 100644
--- a/frysk-core/frysk/ftrace/MappingGuard.java
+++ b/frysk-core/frysk/ftrace/MappingGuard.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/MappingObserver.java b/frysk-core/frysk/ftrace/MappingObserver.java
index 8d1aae0..7715f8a 100644
--- a/frysk-core/frysk/ftrace/MappingObserver.java
+++ b/frysk-core/frysk/ftrace/MappingObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/MemoryMapping.java b/frysk-core/frysk/ftrace/MemoryMapping.java
index 2c19268..d1c1a8c 100644
--- a/frysk-core/frysk/ftrace/MemoryMapping.java
+++ b/frysk-core/frysk/ftrace/MemoryMapping.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/Reporter.java b/frysk-core/frysk/ftrace/Reporter.java
index 876fc77..dcf0513 100644
--- a/frysk-core/frysk/ftrace/Reporter.java
+++ b/frysk-core/frysk/ftrace/Reporter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/Rule.java b/frysk-core/frysk/ftrace/Rule.java
index 69144a1..cc5ea60 100644
--- a/frysk-core/frysk/ftrace/Rule.java
+++ b/frysk-core/frysk/ftrace/Rule.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/RuleOptions.java b/frysk-core/frysk/ftrace/RuleOptions.java
index 3254fe9..c4860cf 100644
--- a/frysk-core/frysk/ftrace/RuleOptions.java
+++ b/frysk-core/frysk/ftrace/RuleOptions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/SymbolRule.java b/frysk-core/frysk/ftrace/SymbolRule.java
index 6b1e18c..d0bea1c 100644
--- a/frysk-core/frysk/ftrace/SymbolRule.java
+++ b/frysk-core/frysk/ftrace/SymbolRule.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/TaskTracer.java b/frysk-core/frysk/ftrace/TaskTracer.java
index 1aff7b6..9a654ec 100644
--- a/frysk-core/frysk/ftrace/TaskTracer.java
+++ b/frysk-core/frysk/ftrace/TaskTracer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/TestMappingGuard.java b/frysk-core/frysk/ftrace/TestMappingGuard.java
index 3125642..876b642 100644
--- a/frysk-core/frysk/ftrace/TestMappingGuard.java
+++ b/frysk-core/frysk/ftrace/TestMappingGuard.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/ftrace/X8664Arch.java b/frysk-core/frysk/ftrace/X8664Arch.java
index 32cd1d8..05f267c 100644
--- a/frysk-core/frysk/ftrace/X8664Arch.java
+++ b/frysk-core/frysk/ftrace/X8664Arch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ActionPointCommands.java b/frysk-core/frysk/hpd/ActionPointCommands.java
index 3c6c681..6c76701 100644
--- a/frysk-core/frysk/hpd/ActionPointCommands.java
+++ b/frysk-core/frysk/hpd/ActionPointCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/AliasCommands.java b/frysk-core/frysk/hpd/AliasCommands.java
index 6c9037a..d223c7d 100644
--- a/frysk-core/frysk/hpd/AliasCommands.java
+++ b/frysk-core/frysk/hpd/AliasCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/AllPTSet.java b/frysk-core/frysk/hpd/AllPTSet.java
index 5e70b0e..5af8356 100644
--- a/frysk-core/frysk/hpd/AllPTSet.java
+++ b/frysk-core/frysk/hpd/AllPTSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/AttachCommand.java b/frysk-core/frysk/hpd/AttachCommand.java
index f96c887..25a5201 100644
--- a/frysk-core/frysk/hpd/AttachCommand.java
+++ b/frysk-core/frysk/hpd/AttachCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/AuxvCommand.java b/frysk-core/frysk/hpd/AuxvCommand.java
index 4c6d323..897b414 100644
--- a/frysk-core/frysk/hpd/AuxvCommand.java
+++ b/frysk-core/frysk/hpd/AuxvCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/BreakpointCommand.java b/frysk-core/frysk/hpd/BreakpointCommand.java
index 082c1d2..3dbaead 100644
--- a/frysk-core/frysk/hpd/BreakpointCommand.java
+++ b/frysk-core/frysk/hpd/BreakpointCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/CLI.java b/frysk-core/frysk/hpd/CLI.java
index eb1533c..3723e47 100644
--- a/frysk-core/frysk/hpd/CLI.java
+++ b/frysk-core/frysk/hpd/CLI.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/Command.java b/frysk-core/frysk/hpd/Command.java
index 3060b9a..fb3ea14 100644
--- a/frysk-core/frysk/hpd/Command.java
+++ b/frysk-core/frysk/hpd/Command.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/CommandOption.java b/frysk-core/frysk/hpd/CommandOption.java
index bddfe7e..a3aac80 100644
--- a/frysk-core/frysk/hpd/CommandOption.java
+++ b/frysk-core/frysk/hpd/CommandOption.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/CompletionFactory.java b/frysk-core/frysk/hpd/CompletionFactory.java
index 3f2de2a..3796a5d 100644
--- a/frysk-core/frysk/hpd/CompletionFactory.java
+++ b/frysk-core/frysk/hpd/CompletionFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/CoreCommand.java b/frysk-core/frysk/hpd/CoreCommand.java
index eda33ff..5145459 100644
--- a/frysk-core/frysk/hpd/CoreCommand.java
+++ b/frysk-core/frysk/hpd/CoreCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DbgVariableCommands.java b/frysk-core/frysk/hpd/DbgVariableCommands.java
index 443c21e..1ee8a57 100644
--- a/frysk-core/frysk/hpd/DbgVariableCommands.java
+++ b/frysk-core/frysk/hpd/DbgVariableCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DbgVariables.java b/frysk-core/frysk/hpd/DbgVariables.java
index 950d356..4b3dda9 100644
--- a/frysk-core/frysk/hpd/DbgVariables.java
+++ b/frysk-core/frysk/hpd/DbgVariables.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DebuginfoCommand.java b/frysk-core/frysk/hpd/DebuginfoCommand.java
index 51c89b6..f08bf44 100644
--- a/frysk-core/frysk/hpd/DebuginfoCommand.java
+++ b/frysk-core/frysk/hpd/DebuginfoCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DefsetCommand.java b/frysk-core/frysk/hpd/DefsetCommand.java
index 0c5834f..4f2c6fd 100644
--- a/frysk-core/frysk/hpd/DefsetCommand.java
+++ b/frysk-core/frysk/hpd/DefsetCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DetachCommand.java b/frysk-core/frysk/hpd/DetachCommand.java
index e98e5a3..b22c609 100644
--- a/frysk-core/frysk/hpd/DetachCommand.java
+++ b/frysk-core/frysk/hpd/DetachCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DisassembleCommand.java b/frysk-core/frysk/hpd/DisassembleCommand.java
index bc64c8f..694d074 100644
--- a/frysk-core/frysk/hpd/DisassembleCommand.java
+++ b/frysk-core/frysk/hpd/DisassembleCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DisplayCommand.java b/frysk-core/frysk/hpd/DisplayCommand.java
index 87bc38e..7b87777 100644
--- a/frysk-core/frysk/hpd/DisplayCommand.java
+++ b/frysk-core/frysk/hpd/DisplayCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/DynamicPTSet.java b/frysk-core/frysk/hpd/DynamicPTSet.java
index c7faaea..766023b 100644
--- a/frysk-core/frysk/hpd/DynamicPTSet.java
+++ b/frysk-core/frysk/hpd/DynamicPTSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/EvalCommands.java b/frysk-core/frysk/hpd/EvalCommands.java
index e796acc..2407ecf 100644
--- a/frysk-core/frysk/hpd/EvalCommands.java
+++ b/frysk-core/frysk/hpd/EvalCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ExecPTSet.java b/frysk-core/frysk/hpd/ExecPTSet.java
index fd5bfc0..931ceb8 100644
--- a/frysk-core/frysk/hpd/ExecPTSet.java
+++ b/frysk-core/frysk/hpd/ExecPTSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/FocusCommand.java b/frysk-core/frysk/hpd/FocusCommand.java
index 12498cb..0ca82e0 100644
--- a/frysk-core/frysk/hpd/FocusCommand.java
+++ b/frysk-core/frysk/hpd/FocusCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/GenerateCoreCommand.java b/frysk-core/frysk/hpd/GenerateCoreCommand.java
index 8f86723..d27dd4e 100644
--- a/frysk-core/frysk/hpd/GenerateCoreCommand.java
+++ b/frysk-core/frysk/hpd/GenerateCoreCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/GoCommand.java b/frysk-core/frysk/hpd/GoCommand.java
index 015340d..5e2fbcd 100644
--- a/frysk-core/frysk/hpd/GoCommand.java
+++ b/frysk-core/frysk/hpd/GoCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/HaltCommand.java b/frysk-core/frysk/hpd/HaltCommand.java
index d2c331a..a04a41f 100644
--- a/frysk-core/frysk/hpd/HaltCommand.java
+++ b/frysk-core/frysk/hpd/HaltCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/HardList.java b/frysk-core/frysk/hpd/HardList.java
index 76fa4f4..7fce896 100644
--- a/frysk-core/frysk/hpd/HardList.java
+++ b/frysk-core/frysk/hpd/HardList.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/HpdTestbed.java b/frysk-core/frysk/hpd/HpdTestbed.java
index df06bbc..8b0e917 100644
--- a/frysk-core/frysk/hpd/HpdTestbed.java
+++ b/frysk-core/frysk/hpd/HpdTestbed.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/InfoArgsCommand.java b/frysk-core/frysk/hpd/InfoArgsCommand.java
index c357ac8..33d99a7 100644
--- a/frysk-core/frysk/hpd/InfoArgsCommand.java
+++ b/frysk-core/frysk/hpd/InfoArgsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/InfoCommand.java b/frysk-core/frysk/hpd/InfoCommand.java
index ba6ccdc..2889cc6 100644
--- a/frysk-core/frysk/hpd/InfoCommand.java
+++ b/frysk-core/frysk/hpd/InfoCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/InfoExeCommand.java b/frysk-core/frysk/hpd/InfoExeCommand.java
index 3500b69..442768f 100644
--- a/frysk-core/frysk/hpd/InfoExeCommand.java
+++ b/frysk-core/frysk/hpd/InfoExeCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/Input.java b/frysk-core/frysk/hpd/Input.java
index 0c12e75..8b6e890 100644
--- a/frysk-core/frysk/hpd/Input.java
+++ b/frysk-core/frysk/hpd/Input.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/InvalidCommandException.java b/frysk-core/frysk/hpd/InvalidCommandException.java
index 8bbb585..421036e 100644
--- a/frysk-core/frysk/hpd/InvalidCommandException.java
+++ b/frysk-core/frysk/hpd/InvalidCommandException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/KillCommand.java b/frysk-core/frysk/hpd/KillCommand.java
index cf7dabc..e9debcd 100644
--- a/frysk-core/frysk/hpd/KillCommand.java
+++ b/frysk-core/frysk/hpd/KillCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ListCommand.java b/frysk-core/frysk/hpd/ListCommand.java
index b46b283..32cf2f6 100644
--- a/frysk-core/frysk/hpd/ListCommand.java
+++ b/frysk-core/frysk/hpd/ListCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/LoadCommand.java b/frysk-core/frysk/hpd/LoadCommand.java
index 34c5d75..63535fc 100644
--- a/frysk-core/frysk/hpd/LoadCommand.java
+++ b/frysk-core/frysk/hpd/LoadCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/Magnitude.java b/frysk-core/frysk/hpd/Magnitude.java
index 065ecf1..893d11c 100644
--- a/frysk-core/frysk/hpd/Magnitude.java
+++ b/frysk-core/frysk/hpd/Magnitude.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/MapsCommand.java b/frysk-core/frysk/hpd/MapsCommand.java
index 833a6da..6fcfc36 100644
--- a/frysk-core/frysk/hpd/MapsCommand.java
+++ b/frysk-core/frysk/hpd/MapsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/Message.java b/frysk-core/frysk/hpd/Message.java
index 933305f..541d74c 100644
--- a/frysk-core/frysk/hpd/Message.java
+++ b/frysk-core/frysk/hpd/Message.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/MultiLevelCommand.java b/frysk-core/frysk/hpd/MultiLevelCommand.java
index ac51455..34d614f 100644
--- a/frysk-core/frysk/hpd/MultiLevelCommand.java
+++ b/frysk-core/frysk/hpd/MultiLevelCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/NoOptsCommand.java b/frysk-core/frysk/hpd/NoOptsCommand.java
index b37ce14..3927b9e 100644
--- a/frysk-core/frysk/hpd/NoOptsCommand.java
+++ b/frysk-core/frysk/hpd/NoOptsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/PTSet.java b/frysk-core/frysk/hpd/PTSet.java
index 64ca07e..56b154b 100644
--- a/frysk-core/frysk/hpd/PTSet.java
+++ b/frysk-core/frysk/hpd/PTSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ParameterizedCommand.java b/frysk-core/frysk/hpd/ParameterizedCommand.java
index d13a4ec..530bfef 100644
--- a/frysk-core/frysk/hpd/ParameterizedCommand.java
+++ b/frysk-core/frysk/hpd/ParameterizedCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ParseTreeNode.java b/frysk-core/frysk/hpd/ParseTreeNode.java
index 46fe1f7..263131f 100644
--- a/frysk-core/frysk/hpd/ParseTreeNode.java
+++ b/frysk-core/frysk/hpd/ParseTreeNode.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ParsedSet.java b/frysk-core/frysk/hpd/ParsedSet.java
index cf82213..2c2af8e 100644
--- a/frysk-core/frysk/hpd/ParsedSet.java
+++ b/frysk-core/frysk/hpd/ParsedSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/PeekCommand.java b/frysk-core/frysk/hpd/PeekCommand.java
index 9c9ec52..43f1425 100644
--- a/frysk-core/frysk/hpd/PeekCommand.java
+++ b/frysk-core/frysk/hpd/PeekCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/Preprocessor.java b/frysk-core/frysk/hpd/Preprocessor.java
index 970efbc..ffa3910 100644
--- a/frysk-core/frysk/hpd/Preprocessor.java
+++ b/frysk-core/frysk/hpd/Preprocessor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ProcData.java b/frysk-core/frysk/hpd/ProcData.java
index 177d8ee..b28f9b5 100644
--- a/frysk-core/frysk/hpd/ProcData.java
+++ b/frysk-core/frysk/hpd/ProcData.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ProcTasks.java b/frysk-core/frysk/hpd/ProcTasks.java
index 51290bd..f1f73ca 100644
--- a/frysk-core/frysk/hpd/ProcTasks.java
+++ b/frysk-core/frysk/hpd/ProcTasks.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/QuitCommand.java b/frysk-core/frysk/hpd/QuitCommand.java
index eeedb50..1aa743c 100644
--- a/frysk-core/frysk/hpd/QuitCommand.java
+++ b/frysk-core/frysk/hpd/QuitCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/RegsCommand.java b/frysk-core/frysk/hpd/RegsCommand.java
index d2ef1bb..e201c53 100644
--- a/frysk-core/frysk/hpd/RegsCommand.java
+++ b/frysk-core/frysk/hpd/RegsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/RunCommand.java b/frysk-core/frysk/hpd/RunCommand.java
index eeef1ac..7c981c7 100644
--- a/frysk-core/frysk/hpd/RunCommand.java
+++ b/frysk-core/frysk/hpd/RunCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/SetNotationParser.java b/frysk-core/frysk/hpd/SetNotationParser.java
index a362cb4..52d3571 100644
--- a/frysk-core/frysk/hpd/SetNotationParser.java
+++ b/frysk-core/frysk/hpd/SetNotationParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ShellCommand.java b/frysk-core/frysk/hpd/ShellCommand.java
index b60a710..c16dcdc 100644
--- a/frysk-core/frysk/hpd/ShellCommand.java
+++ b/frysk-core/frysk/hpd/ShellCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/SigIntHandler.java b/frysk-core/frysk/hpd/SigIntHandler.java
index 235d9f0..b4fb166 100644
--- a/frysk-core/frysk/hpd/SigIntHandler.java
+++ b/frysk-core/frysk/hpd/SigIntHandler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StackCommands.java b/frysk-core/frysk/hpd/StackCommands.java
index 16f183a..ed0fd7c 100644
--- a/frysk-core/frysk/hpd/StackCommands.java
+++ b/frysk-core/frysk/hpd/StackCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StartCommand.java b/frysk-core/frysk/hpd/StartCommand.java
index 841dd29..85dc59a 100644
--- a/frysk-core/frysk/hpd/StartCommand.java
+++ b/frysk-core/frysk/hpd/StartCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java
index 8a25ad1..a7b0e4b 100644
--- a/frysk-core/frysk/hpd/StartRun.java
+++ b/frysk-core/frysk/hpd/StartRun.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StatePTSet.java b/frysk-core/frysk/hpd/StatePTSet.java
index 33d3a87..0480082 100644
--- a/frysk-core/frysk/hpd/StatePTSet.java
+++ b/frysk-core/frysk/hpd/StatePTSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StaticPTSet.java b/frysk-core/frysk/hpd/StaticPTSet.java
index 195ce69..7a34c04 100644
--- a/frysk-core/frysk/hpd/StaticPTSet.java
+++ b/frysk-core/frysk/hpd/StaticPTSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StepCommand.java b/frysk-core/frysk/hpd/StepCommand.java
index a8cc3c0..7fcd4e2 100644
--- a/frysk-core/frysk/hpd/StepCommand.java
+++ b/frysk-core/frysk/hpd/StepCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StepFinishCommand.java b/frysk-core/frysk/hpd/StepFinishCommand.java
index 404e47b..271a0f2 100644
--- a/frysk-core/frysk/hpd/StepFinishCommand.java
+++ b/frysk-core/frysk/hpd/StepFinishCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/StepNextCommand.java b/frysk-core/frysk/hpd/StepNextCommand.java
index 8b996e8..8469c67 100644
--- a/frysk-core/frysk/hpd/StepNextCommand.java
+++ b/frysk-core/frysk/hpd/StepNextCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TaskData.java b/frysk-core/frysk/hpd/TaskData.java
index d13f80b..18ba8d5 100644
--- a/frysk-core/frysk/hpd/TaskData.java
+++ b/frysk-core/frysk/hpd/TaskData.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestActionsCommand.java b/frysk-core/frysk/hpd/TestActionsCommand.java
index b72be4d..0ba96b2 100644
--- a/frysk-core/frysk/hpd/TestActionsCommand.java
+++ b/frysk-core/frysk/hpd/TestActionsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestAliasCommands.java b/frysk-core/frysk/hpd/TestAliasCommands.java
index fd22ee2..3bbd915 100644
--- a/frysk-core/frysk/hpd/TestAliasCommands.java
+++ b/frysk-core/frysk/hpd/TestAliasCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestAuxvCommand.java b/frysk-core/frysk/hpd/TestAuxvCommand.java
index ad8062c..df8f3ce 100644
--- a/frysk-core/frysk/hpd/TestAuxvCommand.java
+++ b/frysk-core/frysk/hpd/TestAuxvCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestBreakpoints.java b/frysk-core/frysk/hpd/TestBreakpoints.java
index 7a8d12c..6fc7d41 100644
--- a/frysk-core/frysk/hpd/TestBreakpoints.java
+++ b/frysk-core/frysk/hpd/TestBreakpoints.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestCompletionFactory.java b/frysk-core/frysk/hpd/TestCompletionFactory.java
index 509ae74..16cff89 100644
--- a/frysk-core/frysk/hpd/TestCompletionFactory.java
+++ b/frysk-core/frysk/hpd/TestCompletionFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestCoreCommand.java b/frysk-core/frysk/hpd/TestCoreCommand.java
index 5179d6d..3ff9190 100644
--- a/frysk-core/frysk/hpd/TestCoreCommand.java
+++ b/frysk-core/frysk/hpd/TestCoreCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestDisassemblerCommand.java b/frysk-core/frysk/hpd/TestDisassemblerCommand.java
index a2fddf2..b357515 100644
--- a/frysk-core/frysk/hpd/TestDisassemblerCommand.java
+++ b/frysk-core/frysk/hpd/TestDisassemblerCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestDisplayCommand.java b/frysk-core/frysk/hpd/TestDisplayCommand.java
index 80fbb1f..568d125 100644
--- a/frysk-core/frysk/hpd/TestDisplayCommand.java
+++ b/frysk-core/frysk/hpd/TestDisplayCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestEvalCommands.java b/frysk-core/frysk/hpd/TestEvalCommands.java
index a8cf17d..b8f477d 100644
--- a/frysk-core/frysk/hpd/TestEvalCommands.java
+++ b/frysk-core/frysk/hpd/TestEvalCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestFhpdStepping.java b/frysk-core/frysk/hpd/TestFhpdStepping.java
index 5a47dc3..8c0b824 100644
--- a/frysk-core/frysk/hpd/TestFhpdStepping.java
+++ b/frysk-core/frysk/hpd/TestFhpdStepping.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestFhpdThreads.java b/frysk-core/frysk/hpd/TestFhpdThreads.java
index aefa5e4..f2cdeba 100644
--- a/frysk-core/frysk/hpd/TestFhpdThreads.java
+++ b/frysk-core/frysk/hpd/TestFhpdThreads.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestGenerateCoreCommand.java b/frysk-core/frysk/hpd/TestGenerateCoreCommand.java
index a48c19d..8c4024b 100644
--- a/frysk-core/frysk/hpd/TestGenerateCoreCommand.java
+++ b/frysk-core/frysk/hpd/TestGenerateCoreCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestGoCommand.java b/frysk-core/frysk/hpd/TestGoCommand.java
index ec066b6..c3e683b 100644
--- a/frysk-core/frysk/hpd/TestGoCommand.java
+++ b/frysk-core/frysk/hpd/TestGoCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestHelloWorld.java b/frysk-core/frysk/hpd/TestHelloWorld.java
index 6bf4001..da146aa 100644
--- a/frysk-core/frysk/hpd/TestHelloWorld.java
+++ b/frysk-core/frysk/hpd/TestHelloWorld.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestHelp.java b/frysk-core/frysk/hpd/TestHelp.java
index 735a077..13417f9 100644
--- a/frysk-core/frysk/hpd/TestHelp.java
+++ b/frysk-core/frysk/hpd/TestHelp.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestHpdTestHarness.java b/frysk-core/frysk/hpd/TestHpdTestHarness.java
index a68763d..ba71b79 100644
--- a/frysk-core/frysk/hpd/TestHpdTestHarness.java
+++ b/frysk-core/frysk/hpd/TestHpdTestHarness.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestInfoArgsCommand.java b/frysk-core/frysk/hpd/TestInfoArgsCommand.java
index d0c3a4c..dacb28f 100644
--- a/frysk-core/frysk/hpd/TestInfoArgsCommand.java
+++ b/frysk-core/frysk/hpd/TestInfoArgsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestInfoExeCommand.java b/frysk-core/frysk/hpd/TestInfoExeCommand.java
index 47a1aca..5f70599 100644
--- a/frysk-core/frysk/hpd/TestInfoExeCommand.java
+++ b/frysk-core/frysk/hpd/TestInfoExeCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestInput.java b/frysk-core/frysk/hpd/TestInput.java
index 4288fd1..f92ea66 100644
--- a/frysk-core/frysk/hpd/TestInput.java
+++ b/frysk-core/frysk/hpd/TestInput.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestKillCommand.java b/frysk-core/frysk/hpd/TestKillCommand.java
index e3711d9..e7deb20 100644
--- a/frysk-core/frysk/hpd/TestKillCommand.java
+++ b/frysk-core/frysk/hpd/TestKillCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestLib.java b/frysk-core/frysk/hpd/TestLib.java
index 0f8a95d..8ff22bb 100644
--- a/frysk-core/frysk/hpd/TestLib.java
+++ b/frysk-core/frysk/hpd/TestLib.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestListCommand.java b/frysk-core/frysk/hpd/TestListCommand.java
index bf44966..dac8723 100644
--- a/frysk-core/frysk/hpd/TestListCommand.java
+++ b/frysk-core/frysk/hpd/TestListCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestLoadCommand.java b/frysk-core/frysk/hpd/TestLoadCommand.java
index 199030d..e3643b5 100644
--- a/frysk-core/frysk/hpd/TestLoadCommand.java
+++ b/frysk-core/frysk/hpd/TestLoadCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestMapsCommand.java b/frysk-core/frysk/hpd/TestMapsCommand.java
index 3ac9e70..f74deca 100644
--- a/frysk-core/frysk/hpd/TestMapsCommand.java
+++ b/frysk-core/frysk/hpd/TestMapsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestParameterizedCommand.java b/frysk-core/frysk/hpd/TestParameterizedCommand.java
index ade8885..d6cbd68 100644
--- a/frysk-core/frysk/hpd/TestParameterizedCommand.java
+++ b/frysk-core/frysk/hpd/TestParameterizedCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestPeekCommand.java b/frysk-core/frysk/hpd/TestPeekCommand.java
index 2a2dbb1..a42cdc2 100644
--- a/frysk-core/frysk/hpd/TestPeekCommand.java
+++ b/frysk-core/frysk/hpd/TestPeekCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestPreprocessor.java b/frysk-core/frysk/hpd/TestPreprocessor.java
index 000d643..6ce4228 100644
--- a/frysk-core/frysk/hpd/TestPreprocessor.java
+++ b/frysk-core/frysk/hpd/TestPreprocessor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestRegs.java b/frysk-core/frysk/hpd/TestRegs.java
index c571187..2aa1649 100644
--- a/frysk-core/frysk/hpd/TestRegs.java
+++ b/frysk-core/frysk/hpd/TestRegs.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestRunCommand.java b/frysk-core/frysk/hpd/TestRunCommand.java
index e324e1d..7fd2815 100644
--- a/frysk-core/frysk/hpd/TestRunCommand.java
+++ b/frysk-core/frysk/hpd/TestRunCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestSetParser.java b/frysk-core/frysk/hpd/TestSetParser.java
index 32fdf76..2e18669 100644
--- a/frysk-core/frysk/hpd/TestSetParser.java
+++ b/frysk-core/frysk/hpd/TestSetParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestShellCommand.java b/frysk-core/frysk/hpd/TestShellCommand.java
index 2bb44e0..1594ae2 100644
--- a/frysk-core/frysk/hpd/TestShellCommand.java
+++ b/frysk-core/frysk/hpd/TestShellCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestStackCommands.java b/frysk-core/frysk/hpd/TestStackCommands.java
index 1a80b2d..feb454a 100644
--- a/frysk-core/frysk/hpd/TestStackCommands.java
+++ b/frysk-core/frysk/hpd/TestStackCommands.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestStartCommand.java b/frysk-core/frysk/hpd/TestStartCommand.java
index 43ab03c..da4a308 100644
--- a/frysk-core/frysk/hpd/TestStartCommand.java
+++ b/frysk-core/frysk/hpd/TestStartCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestSysRoot.java b/frysk-core/frysk/hpd/TestSysRoot.java
index 1f40232..87943a3 100644
--- a/frysk-core/frysk/hpd/TestSysRoot.java
+++ b/frysk-core/frysk/hpd/TestSysRoot.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestUnloadCommand.java b/frysk-core/frysk/hpd/TestUnloadCommand.java
index 39a76a4..68f6cb9 100644
--- a/frysk-core/frysk/hpd/TestUnloadCommand.java
+++ b/frysk-core/frysk/hpd/TestUnloadCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TestWatchCommand.java b/frysk-core/frysk/hpd/TestWatchCommand.java
index c52a756..4eee31d 100644
--- a/frysk-core/frysk/hpd/TestWatchCommand.java
+++ b/frysk-core/frysk/hpd/TestWatchCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/TopLevelCommand.java b/frysk-core/frysk/hpd/TopLevelCommand.java
index 8d1574c..0148e16 100644
--- a/frysk-core/frysk/hpd/TopLevelCommand.java
+++ b/frysk-core/frysk/hpd/TopLevelCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/UndefsetCommand.java b/frysk-core/frysk/hpd/UndefsetCommand.java
index 70dda8f..a013f14 100644
--- a/frysk-core/frysk/hpd/UndefsetCommand.java
+++ b/frysk-core/frysk/hpd/UndefsetCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/UnloadCommand.java b/frysk-core/frysk/hpd/UnloadCommand.java
index 1ca36f8..edbcfce 100644
--- a/frysk-core/frysk/hpd/UnloadCommand.java
+++ b/frysk-core/frysk/hpd/UnloadCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/ViewsetCommand.java b/frysk-core/frysk/hpd/ViewsetCommand.java
index 078ce00..0bd3fbd 100644
--- a/frysk-core/frysk/hpd/ViewsetCommand.java
+++ b/frysk-core/frysk/hpd/ViewsetCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/WatchCommand.java b/frysk-core/frysk/hpd/WatchCommand.java
index c968f18..e02ebe1 100644
--- a/frysk-core/frysk/hpd/WatchCommand.java
+++ b/frysk-core/frysk/hpd/WatchCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/WhatCommand.java b/frysk-core/frysk/hpd/WhatCommand.java
index 17cd48b..f7f3103 100644
--- a/frysk-core/frysk/hpd/WhatCommand.java
+++ b/frysk-core/frysk/hpd/WhatCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/hpd/WhichsetsCommand.java b/frysk-core/frysk/hpd/WhichsetsCommand.java
index d227696..c1a7838 100644
--- a/frysk-core/frysk/hpd/WhichsetsCommand.java
+++ b/frysk-core/frysk/hpd/WhichsetsCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/ElfMap.java b/frysk-core/frysk/isa/ElfMap.java
index b42ca14..be2abd1 100644
--- a/frysk-core/frysk/isa/ElfMap.java
+++ b/frysk-core/frysk/isa/ElfMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/ISA.java b/frysk-core/frysk/isa/ISA.java
index fca91a2..1aa0604 100644
--- a/frysk-core/frysk/isa/ISA.java
+++ b/frysk-core/frysk/isa/ISA.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/ISAMap.java b/frysk-core/frysk/isa/ISAMap.java
index 25fa072..c586e92 100644
--- a/frysk-core/frysk/isa/ISAMap.java
+++ b/frysk-core/frysk/isa/ISAMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/TestISA.java b/frysk-core/frysk/isa/TestISA.java
index ec2af99..28d42a9 100644
--- a/frysk-core/frysk/isa/TestISA.java
+++ b/frysk-core/frysk/isa/TestISA.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/BankArrayRegister.java b/frysk-core/frysk/isa/banks/BankArrayRegister.java
index 0085aa6..5a187d5 100644
--- a/frysk-core/frysk/isa/banks/BankArrayRegister.java
+++ b/frysk-core/frysk/isa/banks/BankArrayRegister.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/BankArrayRegisterMap.java b/frysk-core/frysk/isa/banks/BankArrayRegisterMap.java
index 4bed5f6..4531e29 100644
--- a/frysk-core/frysk/isa/banks/BankArrayRegisterMap.java
+++ b/frysk-core/frysk/isa/banks/BankArrayRegisterMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/BankRegister.java b/frysk-core/frysk/isa/banks/BankRegister.java
index da077be..20033ae 100644
--- a/frysk-core/frysk/isa/banks/BankRegister.java
+++ b/frysk-core/frysk/isa/banks/BankRegister.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/BankRegisterMap.java b/frysk-core/frysk/isa/banks/BankRegisterMap.java
index 93c878b..7f6b6c1 100644
--- a/frysk-core/frysk/isa/banks/BankRegisterMap.java
+++ b/frysk-core/frysk/isa/banks/BankRegisterMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/IndirectBankArrayRegisterMap.java b/frysk-core/frysk/isa/banks/IndirectBankArrayRegisterMap.java
index 7d5d3a4..3236c87 100644
--- a/frysk-core/frysk/isa/banks/IndirectBankArrayRegisterMap.java
+++ b/frysk-core/frysk/isa/banks/IndirectBankArrayRegisterMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/LinuxIA32RegisterBanks.java b/frysk-core/frysk/isa/banks/LinuxIA32RegisterBanks.java
index 4979189..dfe6917 100644
--- a/frysk-core/frysk/isa/banks/LinuxIA32RegisterBanks.java
+++ b/frysk-core/frysk/isa/banks/LinuxIA32RegisterBanks.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/LinuxPPCRegisterBanks.java b/frysk-core/frysk/isa/banks/LinuxPPCRegisterBanks.java
index b2fd02b..fe8fbdb 100644
--- a/frysk-core/frysk/isa/banks/LinuxPPCRegisterBanks.java
+++ b/frysk-core/frysk/isa/banks/LinuxPPCRegisterBanks.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/LinuxX8664RegisterBanks.java b/frysk-core/frysk/isa/banks/LinuxX8664RegisterBanks.java
index bd2256f..eef4024 100644
--- a/frysk-core/frysk/isa/banks/LinuxX8664RegisterBanks.java
+++ b/frysk-core/frysk/isa/banks/LinuxX8664RegisterBanks.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/PPCBankRegisters.java b/frysk-core/frysk/isa/banks/PPCBankRegisters.java
index 40d72d6..daefcfc 100644
--- a/frysk-core/frysk/isa/banks/PPCBankRegisters.java
+++ b/frysk-core/frysk/isa/banks/PPCBankRegisters.java
@@ -16,8 +16,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/RegisterBanks.java b/frysk-core/frysk/isa/banks/RegisterBanks.java
index 8558f2b..5088b24 100644
--- a/frysk-core/frysk/isa/banks/RegisterBanks.java
+++ b/frysk-core/frysk/isa/banks/RegisterBanks.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/RegisterMap.java b/frysk-core/frysk/isa/banks/RegisterMap.java
index 70675b8..f00ddad 100644
--- a/frysk-core/frysk/isa/banks/RegisterMap.java
+++ b/frysk-core/frysk/isa/banks/RegisterMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/banks/X86BankRegisters.java b/frysk-core/frysk/isa/banks/X86BankRegisters.java
index 803b30f..68f73a2 100644
--- a/frysk-core/frysk/isa/banks/X86BankRegisters.java
+++ b/frysk-core/frysk/isa/banks/X86BankRegisters.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
index af626a4..265b7ef 100644
--- a/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/IA32LinuxElfCorefile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
index 0686c2d..f3d50d8 100644
--- a/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/LinuxElfCorefile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/LinuxElfCorefileFactory.java b/frysk-core/frysk/isa/corefiles/LinuxElfCorefileFactory.java
index 7ad3c42..b5b130f 100644
--- a/frysk-core/frysk/isa/corefiles/LinuxElfCorefileFactory.java
+++ b/frysk-core/frysk/isa/corefiles/LinuxElfCorefileFactory.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
index 3968dea..3ef31d4 100644
--- a/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/PPC32LinuxElfCorefile.java
@@ -16,8 +16,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
index 42b15ca..cced6c5 100644
--- a/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/PPC64LinuxElfCorefile.java
@@ -16,8 +16,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/TestLinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/TestLinuxElfCorefile.java
index d4a8de5..0b2de1f 100644
--- a/frysk-core/frysk/isa/corefiles/TestLinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/TestLinuxElfCorefile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
index 8679aeb..2a019c7 100644
--- a/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
+++ b/frysk-core/frysk/isa/corefiles/X8664LinuxElfCorefile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/IA32Registers.java b/frysk-core/frysk/isa/registers/IA32Registers.java
index ed5bd91..541292e 100644
--- a/frysk-core/frysk/isa/registers/IA32Registers.java
+++ b/frysk-core/frysk/isa/registers/IA32Registers.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/PPC32Registers.java b/frysk-core/frysk/isa/registers/PPC32Registers.java
index 1aabb9c..dcc56a8 100644
--- a/frysk-core/frysk/isa/registers/PPC32Registers.java
+++ b/frysk-core/frysk/isa/registers/PPC32Registers.java
@@ -16,8 +16,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/PPC64Registers.java b/frysk-core/frysk/isa/registers/PPC64Registers.java
index a5505c4..4eba07c 100644
--- a/frysk-core/frysk/isa/registers/PPC64Registers.java
+++ b/frysk-core/frysk/isa/registers/PPC64Registers.java
@@ -16,8 +16,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/Register.java b/frysk-core/frysk/isa/registers/Register.java
index a3b3c23..d37e828 100644
--- a/frysk-core/frysk/isa/registers/Register.java
+++ b/frysk-core/frysk/isa/registers/Register.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/RegisterGroup.java b/frysk-core/frysk/isa/registers/RegisterGroup.java
index 1e59ee5..17bce82 100644
--- a/frysk-core/frysk/isa/registers/RegisterGroup.java
+++ b/frysk-core/frysk/isa/registers/RegisterGroup.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/RegisterMap.java b/frysk-core/frysk/isa/registers/RegisterMap.java
index c655f5b..fd5e1a4 100644
--- a/frysk-core/frysk/isa/registers/RegisterMap.java
+++ b/frysk-core/frysk/isa/registers/RegisterMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/Registers.java b/frysk-core/frysk/isa/registers/Registers.java
index 9f4daf1..9e56a84 100644
--- a/frysk-core/frysk/isa/registers/Registers.java
+++ b/frysk-core/frysk/isa/registers/Registers.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/RegistersFactory.java b/frysk-core/frysk/isa/registers/RegistersFactory.java
index e2633b9..7c498c1 100644
--- a/frysk-core/frysk/isa/registers/RegistersFactory.java
+++ b/frysk-core/frysk/isa/registers/RegistersFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/TestRegisterMap.java b/frysk-core/frysk/isa/registers/TestRegisterMap.java
index fa9b715..0e8c727 100644
--- a/frysk-core/frysk/isa/registers/TestRegisterMap.java
+++ b/frysk-core/frysk/isa/registers/TestRegisterMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/TestRegisters.java b/frysk-core/frysk/isa/registers/TestRegisters.java
index 82c3b99..16393c5 100644
--- a/frysk-core/frysk/isa/registers/TestRegisters.java
+++ b/frysk-core/frysk/isa/registers/TestRegisters.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/X8664Registers.java b/frysk-core/frysk/isa/registers/X8664Registers.java
index 8b4efb2..f1327a3 100644
--- a/frysk-core/frysk/isa/registers/X8664Registers.java
+++ b/frysk-core/frysk/isa/registers/X8664Registers.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/registers/X87Registers.java b/frysk-core/frysk/isa/registers/X87Registers.java
index 943b135..c2bf3d4 100644
--- a/frysk-core/frysk/isa/registers/X87Registers.java
+++ b/frysk-core/frysk/isa/registers/X87Registers.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/signals/Signal.java b/frysk-core/frysk/isa/signals/Signal.java
index 0892ae3..c5a3e30 100644
--- a/frysk-core/frysk/isa/signals/Signal.java
+++ b/frysk-core/frysk/isa/signals/Signal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/signals/SignalTable.java b/frysk-core/frysk/isa/signals/SignalTable.java
index 035535d..0a93c2f 100644
--- a/frysk-core/frysk/isa/signals/SignalTable.java
+++ b/frysk-core/frysk/isa/signals/SignalTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/signals/SignalTableFactory.java b/frysk-core/frysk/isa/signals/SignalTableFactory.java
index c4e4fc1..9a5f3ed 100644
--- a/frysk-core/frysk/isa/signals/SignalTableFactory.java
+++ b/frysk-core/frysk/isa/signals/SignalTableFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/signals/StandardSignal.java b/frysk-core/frysk/isa/signals/StandardSignal.java
index ecd1fc9..4b832cc 100644
--- a/frysk-core/frysk/isa/signals/StandardSignal.java
+++ b/frysk-core/frysk/isa/signals/StandardSignal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/signals/TestSignalTable.java b/frysk-core/frysk/isa/signals/TestSignalTable.java
index 307d99e..cced8f4 100644
--- a/frysk-core/frysk/isa/signals/TestSignalTable.java
+++ b/frysk-core/frysk/isa/signals/TestSignalTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/LinuxIA32SyscallTable.java b/frysk-core/frysk/isa/syscalls/LinuxIA32SyscallTable.java
index 779aa03..e1749e1 100644
--- a/frysk-core/frysk/isa/syscalls/LinuxIA32SyscallTable.java
+++ b/frysk-core/frysk/isa/syscalls/LinuxIA32SyscallTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/LinuxPPC32SyscallTable.java b/frysk-core/frysk/isa/syscalls/LinuxPPC32SyscallTable.java
index 04ff138..34154fa 100644
--- a/frysk-core/frysk/isa/syscalls/LinuxPPC32SyscallTable.java
+++ b/frysk-core/frysk/isa/syscalls/LinuxPPC32SyscallTable.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/LinuxPPC64SyscallTable.java b/frysk-core/frysk/isa/syscalls/LinuxPPC64SyscallTable.java
index d6bfcc4..ef7493a 100644
--- a/frysk-core/frysk/isa/syscalls/LinuxPPC64SyscallTable.java
+++ b/frysk-core/frysk/isa/syscalls/LinuxPPC64SyscallTable.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/LinuxX8664SyscallTable.java b/frysk-core/frysk/isa/syscalls/LinuxX8664SyscallTable.java
index 12d79fe..5830829 100644
--- a/frysk-core/frysk/isa/syscalls/LinuxX8664SyscallTable.java
+++ b/frysk-core/frysk/isa/syscalls/LinuxX8664SyscallTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/Syscall.java b/frysk-core/frysk/isa/syscalls/Syscall.java
index 22da117..fee56e7 100644
--- a/frysk-core/frysk/isa/syscalls/Syscall.java
+++ b/frysk-core/frysk/isa/syscalls/Syscall.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/SyscallTable.java b/frysk-core/frysk/isa/syscalls/SyscallTable.java
index 52b3d13..9e1527a 100644
--- a/frysk-core/frysk/isa/syscalls/SyscallTable.java
+++ b/frysk-core/frysk/isa/syscalls/SyscallTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/SyscallTableFactory.java b/frysk-core/frysk/isa/syscalls/SyscallTableFactory.java
index 6ff2c5d..360052a 100644
--- a/frysk-core/frysk/isa/syscalls/SyscallTableFactory.java
+++ b/frysk-core/frysk/isa/syscalls/SyscallTableFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java b/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java
index 8d612eb..87c21c4 100644
--- a/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java
+++ b/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java b/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java
index e9d43ab..323ec8e 100644
--- a/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java
+++ b/frysk-core/frysk/isa/watchpoints/IA32WatchpointFunctions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java b/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java
index d59d933..14067de 100644
--- a/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java
+++ b/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/watchpoints/Watchpoint.java b/frysk-core/frysk/isa/watchpoints/Watchpoint.java
index ef88924..251d1aa 100644
--- a/frysk-core/frysk/isa/watchpoints/Watchpoint.java
+++ b/frysk-core/frysk/isa/watchpoints/Watchpoint.java
@@ -15,8 +15,7 @@ package frysk.isa.watchpoints;
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java b/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java
index fe8b81b..b32358f 100644
--- a/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java
+++ b/frysk-core/frysk/isa/watchpoints/WatchpointFunctionFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java b/frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java
index 973678f..bd70e1c 100644
--- a/frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java
+++ b/frysk-core/frysk/isa/watchpoints/WatchpointFunctions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java b/frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java
index 45e667a..25ad61c 100644
--- a/frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java
+++ b/frysk-core/frysk/isa/watchpoints/X8664WatchpointFunctions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkgdatadir/test-exe-x86.c.source b/frysk-core/frysk/pkgdatadir/test-exe-x86.c.source
index 4257e59..cad8bcf 100644
--- a/frysk-core/frysk/pkgdatadir/test-exe-x86.c.source
+++ b/frysk-core/frysk/pkgdatadir/test-exe-x86.c.source
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkgdatadir/test_looper.xml b/frysk-core/frysk/pkgdatadir/test_looper.xml
index 914c645..b9e9e79 100644
--- a/frysk-core/frysk/pkgdatadir/test_looper.xml
+++ b/frysk-core/frysk/pkgdatadir/test_looper.xml
@@ -13,8 +13,7 @@
 </line><line number="11" pc="3735928559" offset="480" length="44" executable="false" has_break="false">// General Public License for more details.
 </line><line number="12" pc="3735928559" offset="524" length="4" executable="false" has_break="false">// 
 </line><line number="13" pc="3735928559" offset="528" length="69" executable="false" has_break="false">// You should have received a copy of the GNU General Public License
-</line><line number="14" pc="3735928559" offset="597" length="68" executable="false" has_break="false">// along with FRYSK; if not, write to the Free Software Foundation,
-</line><line number="15" pc="3735928559" offset="665" length="64" executable="false" has_break="false">// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+</line><line number="14" pc="3735928559" offset="597" length="68" executable="false" has_break="false">// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 </line><line number="16" pc="3735928559" offset="729" length="4" executable="false" has_break="false">// 
 </line><line number="17" pc="3735928559" offset="733" length="68" executable="false" has_break="false">// In addition, as a special exception, Red Hat, Inc. gives You the
 </line><line number="18" pc="3735928559" offset="801" length="68" executable="false" has_break="false">// additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java b/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java
index 6fb5207..6dc1df1 100644
--- a/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java
+++ b/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java b/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
index d395eff..d62151a 100644
--- a/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
+++ b/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-2threads.c b/frysk-core/frysk/pkglibdir/funit-2threads.c
index 83a4db5..970c90c 100644
--- a/frysk-core/frysk/pkglibdir/funit-2threads.c
+++ b/frysk-core/frysk/pkglibdir/funit-2threads.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-3forks.c b/frysk-core/frysk/pkglibdir/funit-3forks.c
index 29619ae..4e86d33 100644
--- a/frysk-core/frysk/pkglibdir/funit-3forks.c
+++ b/frysk-core/frysk/pkglibdir/funit-3forks.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-addresses.c b/frysk-core/frysk/pkglibdir/funit-addresses.c
index 569d65a..8fb0803 100644
--- a/frysk-core/frysk/pkglibdir/funit-addresses.c
+++ b/frysk-core/frysk/pkglibdir/funit-addresses.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-alarm.c b/frysk-core/frysk/pkglibdir/funit-alarm.c
index 26fb534..8b845a2 100644
--- a/frysk-core/frysk/pkglibdir/funit-alarm.c
+++ b/frysk-core/frysk/pkglibdir/funit-alarm.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-asm.S b/frysk-core/frysk/pkglibdir/funit-asm.S
index 458f740..c4b9b53 100644
--- a/frysk-core/frysk/pkglibdir/funit-asm.S
+++ b/frysk-core/frysk/pkglibdir/funit-asm.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-breakpoints.c b/frysk-core/frysk/pkglibdir/funit-breakpoints.c
index 1d13118..3779424 100644
--- a/frysk-core/frysk/pkglibdir/funit-breakpoints.c
+++ b/frysk-core/frysk/pkglibdir/funit-breakpoints.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-bubblesort.c b/frysk-core/frysk/pkglibdir/funit-bubblesort.c
index 7e54592..7b2c43b 100644
--- a/frysk-core/frysk/pkglibdir/funit-bubblesort.c
+++ b/frysk-core/frysk/pkglibdir/funit-bubblesort.c
@@ -12,8 +12,7 @@
 /* 12 */ // General Public License for more details.
 /* 13 */ // 
 /* 14 */ // You should have received a copy of the GNU General Public License
-/* 15 */ // along with FRYSK; if not, write to the Free Software Foundation,
-/* 16 */ // Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+/* 15 */ // along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 /* 17 */ // 
 /* 18 */ // In addition, as a special exception, Red Hat, Inc. gives You the
 /* 19 */ // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-calls.c b/frysk-core/frysk/pkglibdir/funit-calls.c
index d74ee50..437d77f 100644
--- a/frysk-core/frysk/pkglibdir/funit-calls.c
+++ b/frysk-core/frysk/pkglibdir/funit-calls.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-child.c b/frysk-core/frysk/pkglibdir/funit-child.c
index 533b047..29fcdd8 100644
--- a/frysk-core/frysk/pkglibdir/funit-child.c
+++ b/frysk-core/frysk/pkglibdir/funit-child.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-class-static.cxx b/frysk-core/frysk/pkglibdir/funit-class-static.cxx
index ed15231..4e262b0 100644
--- a/frysk-core/frysk/pkglibdir/funit-class-static.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-class-static.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-complex-class.cxx b/frysk-core/frysk/pkglibdir/funit-complex-class.cxx
index 6843cf5..7ce0b0c 100644
--- a/frysk-core/frysk/pkglibdir/funit-complex-class.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-complex-class.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-complex-struct.cxx b/frysk-core/frysk/pkglibdir/funit-complex-struct.cxx
index 32b7744..3ec9501 100644
--- a/frysk-core/frysk/pkglibdir/funit-complex-struct.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-complex-struct.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class-static.cxx b/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class-static.cxx
index 14f5012..26642b6 100644
--- a/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class-static.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class-static.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class.cxx b/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class.cxx
index ccc73eb..9bc3517 100644
--- a/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-cpp-scopes-class.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-cpp-scopes-namespace.cxx b/frysk-core/frysk/pkglibdir/funit-cpp-scopes-namespace.cxx
index 031062a..eacc441 100644
--- a/frysk-core/frysk/pkglibdir/funit-cpp-scopes-namespace.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-cpp-scopes-namespace.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-ctypes.c b/frysk-core/frysk/pkglibdir/funit-ctypes.c
index 9337ab6..8e2480f 100644
--- a/frysk-core/frysk/pkglibdir/funit-ctypes.c
+++ b/frysk-core/frysk/pkglibdir/funit-ctypes.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-elf-symbols.S b/frysk-core/frysk/pkglibdir/funit-elf-symbols.S
index 169671d..5766a38 100644
--- a/frysk-core/frysk/pkglibdir/funit-elf-symbols.S
+++ b/frysk-core/frysk/pkglibdir/funit-elf-symbols.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-exec.c b/frysk-core/frysk/pkglibdir/funit-exec.c
index c763c61..8d8eb00 100644
--- a/frysk-core/frysk/pkglibdir/funit-exec.c
+++ b/frysk-core/frysk/pkglibdir/funit-exec.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-exec.xml-in b/frysk-core/frysk/pkglibdir/funit-exec.xml-in
index f12c83f..e58f1d6 100644
--- a/frysk-core/frysk/pkglibdir/funit-exec.xml-in
+++ b/frysk-core/frysk/pkglibdir/funit-exec.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-exit.c b/frysk-core/frysk/pkglibdir/funit-exit.c
index d771f14..3f1dd6e 100644
--- a/frysk-core/frysk/pkglibdir/funit-exit.c
+++ b/frysk-core/frysk/pkglibdir/funit-exit.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-exit.xml-in b/frysk-core/frysk/pkglibdir/funit-exit.xml-in
index defe3da..34cee80 100644
--- a/frysk-core/frysk/pkglibdir/funit-exit.xml-in
+++ b/frysk-core/frysk/pkglibdir/funit-exit.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-fib-clone.c b/frysk-core/frysk/pkglibdir/funit-fib-clone.c
index 9a1a8f6..66452ed 100644
--- a/frysk-core/frysk/pkglibdir/funit-fib-clone.c
+++ b/frysk-core/frysk/pkglibdir/funit-fib-clone.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-fib-exec.c b/frysk-core/frysk/pkglibdir/funit-fib-exec.c
index bfbb9df..d55ff58 100644
--- a/frysk-core/frysk/pkglibdir/funit-fib-exec.c
+++ b/frysk-core/frysk/pkglibdir/funit-fib-exec.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-fib-fork.c b/frysk-core/frysk/pkglibdir/funit-fib-fork.c
index d64138e..0d16f52 100644
--- a/frysk-core/frysk/pkglibdir/funit-fib-fork.c
+++ b/frysk-core/frysk/pkglibdir/funit-fib-fork.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-frameless.S b/frysk-core/frysk/pkglibdir/funit-frameless.S
index a856cc3..81e1340 100644
--- a/frysk-core/frysk/pkglibdir/funit-frameless.S
+++ b/frysk-core/frysk/pkglibdir/funit-frameless.S
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-hello.c b/frysk-core/frysk/pkglibdir/funit-hello.c
index c2c0e5d..3e6b9b1 100644
--- a/frysk-core/frysk/pkglibdir/funit-hello.c
+++ b/frysk-core/frysk/pkglibdir/funit-hello.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-hups.c b/frysk-core/frysk/pkglibdir/funit-hups.c
index 36c0d2c..1dfa61d 100644
--- a/frysk-core/frysk/pkglibdir/funit-hups.c
+++ b/frysk-core/frysk/pkglibdir/funit-hups.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-iftester.S b/frysk-core/frysk/pkglibdir/funit-iftester.S
index bf10e87..2958b76 100644
--- a/frysk-core/frysk/pkglibdir/funit-iftester.S
+++ b/frysk-core/frysk/pkglibdir/funit-iftester.S
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-inherited-struct.cxx b/frysk-core/frysk/pkglibdir/funit-inherited-struct.cxx
index 56295dd..32daeda 100644
--- a/frysk-core/frysk/pkglibdir/funit-inherited-struct.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-inherited-struct.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-instructions.S b/frysk-core/frysk/pkglibdir/funit-instructions.S
index e38a339..7298975 100644
--- a/frysk-core/frysk/pkglibdir/funit-instructions.S
+++ b/frysk-core/frysk/pkglibdir/funit-instructions.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-legacy.c b/frysk-core/frysk/pkglibdir/funit-legacy.c
index 533b047..29fcdd8 100644
--- a/frysk-core/frysk/pkglibdir/funit-legacy.c
+++ b/frysk-core/frysk/pkglibdir/funit-legacy.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-libcall.c b/frysk-core/frysk/pkglibdir/funit-libcall.c
index 578b0a2..07bde08 100644
--- a/frysk-core/frysk/pkglibdir/funit-libcall.c
+++ b/frysk-core/frysk/pkglibdir/funit-libcall.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-libfunccall.c b/frysk-core/frysk/pkglibdir/funit-libfunccall.c
index 2055f27..06c9890 100644
--- a/frysk-core/frysk/pkglibdir/funit-libfunccall.c
+++ b/frysk-core/frysk/pkglibdir/funit-libfunccall.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-location.S b/frysk-core/frysk/pkglibdir/funit-location.S
index 316c059..203defd 100644
--- a/frysk-core/frysk/pkglibdir/funit-location.S
+++ b/frysk-core/frysk/pkglibdir/funit-location.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-loop-signal.c b/frysk-core/frysk/pkglibdir/funit-loop-signal.c
index c3eacfa..f607c53 100644
--- a/frysk-core/frysk/pkglibdir/funit-loop-signal.c
+++ b/frysk-core/frysk/pkglibdir/funit-loop-signal.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-parameters.c b/frysk-core/frysk/pkglibdir/funit-parameters.c
index 9c3350b..42c93bb 100644
--- a/frysk-core/frysk/pkglibdir/funit-parameters.c
+++ b/frysk-core/frysk/pkglibdir/funit-parameters.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-print-argc.c b/frysk-core/frysk/pkglibdir/funit-print-argc.c
index 47a5081..ca82222 100644
--- a/frysk-core/frysk/pkglibdir/funit-print-argc.c
+++ b/frysk-core/frysk/pkglibdir/funit-print-argc.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-print-argv.c b/frysk-core/frysk/pkglibdir/funit-print-argv.c
index c8eb711..a74bbdd 100644
--- a/frysk-core/frysk/pkglibdir/funit-print-argv.c
+++ b/frysk-core/frysk/pkglibdir/funit-print-argv.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-print-auxv.c b/frysk-core/frysk/pkglibdir/funit-print-auxv.c
index 324166a..1a1d3d6 100644
--- a/frysk-core/frysk/pkglibdir/funit-print-auxv.c
+++ b/frysk-core/frysk/pkglibdir/funit-print-auxv.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-print-envp.c b/frysk-core/frysk/pkglibdir/funit-print-envp.c
index 707e690..64c649d 100644
--- a/frysk-core/frysk/pkglibdir/funit-print-envp.c
+++ b/frysk-core/frysk/pkglibdir/funit-print-envp.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-quicksort.c b/frysk-core/frysk/pkglibdir/funit-quicksort.c
index cba93a9..e9c1a08 100644
--- a/frysk-core/frysk/pkglibdir/funit-quicksort.c
+++ b/frysk-core/frysk/pkglibdir/funit-quicksort.c
@@ -12,8 +12,7 @@
 /* 12 */ // General Public License for more details.
 /* 13 */ // 
 /* 14 */ // You should have received a copy of the GNU General Public License
-/* 15 */ // along with FRYSK; if not, write to the Free Software Foundation,
-/* 16 */ // Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+/* 15 */ // along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 /* 17 */ // 
 /* 18 */ // In addition, as a special exception, Red Hat, Inc. gives You the
 /* 19 */ // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-raise.S b/frysk-core/frysk/pkglibdir/funit-raise.S
index 2241aae..c8ee4a1 100644
--- a/frysk-core/frysk/pkglibdir/funit-raise.S
+++ b/frysk-core/frysk/pkglibdir/funit-raise.S
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-regs.S b/frysk-core/frysk/pkglibdir/funit-regs.S
index 6a9284a..4ff7228 100644
--- a/frysk-core/frysk/pkglibdir/funit-regs.S
+++ b/frysk-core/frysk/pkglibdir/funit-regs.S
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-asmstepper.S b/frysk-core/frysk/pkglibdir/funit-rt-asmstepper.S
index acb7567..2fd0173 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-asmstepper.S
+++ b/frysk-core/frysk/pkglibdir/funit-rt-asmstepper.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-goto.c b/frysk-core/frysk/pkglibdir/funit-rt-goto.c
index 51cbe32..928096b 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-goto.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-goto.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-looper.c b/frysk-core/frysk/pkglibdir/funit-rt-looper.c
index 4bda4b1..b7ecee2 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-looper.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-looper.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c b/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
index 80c9122..3ad4368 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c b/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
index 0a01625..4270edf 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-stepper.c b/frysk-core/frysk/pkglibdir/funit-rt-stepper.c
index 99c6a76..39ffff0 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-stepper.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-stepper.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
index 59c9d47..ccb67d8 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-threader.c b/frysk-core/frysk/pkglibdir/funit-rt-threader.c
index 657525c..73d0aa4 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-threader.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-threader.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c b/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
index 13751bb..b69736c 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-varchange.c b/frysk-core/frysk/pkglibdir/funit-rt-varchange.c
index 6835208..11fb21e 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-varchange.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-varchange.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-varlongjmp.c b/frysk-core/frysk/pkglibdir/funit-rt-varlongjmp.c
index 70f0869..b13dfa3 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-varlongjmp.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-varlongjmp.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-varsegv.c b/frysk-core/frysk/pkglibdir/funit-rt-varsegv.c
index 35a448a..999bd4c 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-varsegv.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-varsegv.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-simple-class.cxx b/frysk-core/frysk/pkglibdir/funit-simple-class.cxx
index a50844a..2ca860a 100644
--- a/frysk-core/frysk/pkglibdir/funit-simple-class.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-simple-class.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-simple-struct.cxx b/frysk-core/frysk/pkglibdir/funit-simple-struct.cxx
index 98a7e0e..a866789 100644
--- a/frysk-core/frysk/pkglibdir/funit-simple-struct.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-simple-struct.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-slave.c b/frysk-core/frysk/pkglibdir/funit-slave.c
index f10e4d6..8a94f7c 100644
--- a/frysk-core/frysk/pkglibdir/funit-slave.c
+++ b/frysk-core/frysk/pkglibdir/funit-slave.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-slave.xml-in b/frysk-core/frysk/pkglibdir/funit-slave.xml-in
index 6c49bdb..9a634a5 100644
--- a/frysk-core/frysk/pkglibdir/funit-slave.xml-in
+++ b/frysk-core/frysk/pkglibdir/funit-slave.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-stack-inlined.c b/frysk-core/frysk/pkglibdir/funit-stack-inlined.c
index ba9fbac..bda85bf 100644
--- a/frysk-core/frysk/pkglibdir/funit-stack-inlined.c
+++ b/frysk-core/frysk/pkglibdir/funit-stack-inlined.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-stack-outlined.c b/frysk-core/frysk/pkglibdir/funit-stack-outlined.c
index 70e9da4..695ab46 100644
--- a/frysk-core/frysk/pkglibdir/funit-stack-outlined.c
+++ b/frysk-core/frysk/pkglibdir/funit-stack-outlined.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-stackframe.S b/frysk-core/frysk/pkglibdir/funit-stackframe.S
index ecc7519..600ee75 100644
--- a/frysk-core/frysk/pkglibdir/funit-stackframe.S
+++ b/frysk-core/frysk/pkglibdir/funit-stackframe.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-stepping-asm.S b/frysk-core/frysk/pkglibdir/funit-stepping-asm.S
index f145566..9c32d10 100644
--- a/frysk-core/frysk/pkglibdir/funit-stepping-asm.S
+++ b/frysk-core/frysk/pkglibdir/funit-stepping-asm.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-symbols.S b/frysk-core/frysk/pkglibdir/funit-symbols.S
index cbb0063..c127ce6 100644
--- a/frysk-core/frysk/pkglibdir/funit-symbols.S
+++ b/frysk-core/frysk/pkglibdir/funit-symbols.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscall-exec.c b/frysk-core/frysk/pkglibdir/funit-syscall-exec.c
index 7bbe14d..9a6130f 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscall-exec.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscall-exec.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscall-running.c b/frysk-core/frysk/pkglibdir/funit-syscall-running.c
index 14c1aa7..2a0a999 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscall-running.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscall-running.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscall-signal.c b/frysk-core/frysk/pkglibdir/funit-syscall-signal.c
index 7213005..befda02 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscall-signal.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscall-signal.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscall-threadexec.c b/frysk-core/frysk/pkglibdir/funit-syscall-threadexec.c
index e607696..446d8f4 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscall-threadexec.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscall-threadexec.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscallint.c b/frysk-core/frysk/pkglibdir/funit-syscallint.c
index ba26d80..3399753 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscallint.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscallint.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscallloop.c b/frysk-core/frysk/pkglibdir/funit-syscallloop.c
index 293c514..2a505d4 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscallloop.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscallloop.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-syscalls.c b/frysk-core/frysk/pkglibdir/funit-syscalls.c
index 3cc7461..f53f877 100644
--- a/frysk-core/frysk/pkglibdir/funit-syscalls.c
+++ b/frysk-core/frysk/pkglibdir/funit-syscalls.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-threads-looper.c b/frysk-core/frysk/pkglibdir/funit-threads-looper.c
index 1e436d5..bc2931a 100644
--- a/frysk-core/frysk/pkglibdir/funit-threads-looper.c
+++ b/frysk-core/frysk/pkglibdir/funit-threads-looper.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-threads.c b/frysk-core/frysk/pkglibdir/funit-threads.c
index 5877396..4b99db8 100644
--- a/frysk-core/frysk/pkglibdir/funit-threads.c
+++ b/frysk-core/frysk/pkglibdir/funit-threads.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-threads.xml-in b/frysk-core/frysk/pkglibdir/funit-threads.xml-in
index e0ce994..323ca15 100644
--- a/frysk-core/frysk/pkglibdir/funit-threads.xml-in
+++ b/frysk-core/frysk/pkglibdir/funit-threads.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-type-class.cxx b/frysk-core/frysk/pkglibdir/funit-type-class.cxx
index 9898aa4..81aef6f 100644
--- a/frysk-core/frysk/pkglibdir/funit-type-class.cxx
+++ b/frysk-core/frysk/pkglibdir/funit-type-class.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-vfork.c b/frysk-core/frysk/pkglibdir/funit-vfork.c
index d40b923..357367f 100644
--- a/frysk-core/frysk/pkglibdir/funit-vfork.c
+++ b/frysk-core/frysk/pkglibdir/funit-vfork.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/funit-watchpoint.S b/frysk-core/frysk/pkglibdir/funit-watchpoint.S
index 8872a4f..4892799 100644
--- a/frysk-core/frysk/pkglibdir/funit-watchpoint.S
+++ b/frysk-core/frysk/pkglibdir/funit-watchpoint.S
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py
index e299ca4..e7e1b7a 100644
--- a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py
+++ b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
@@ -88,8 +87,7 @@ class c:
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/pkglibdir/hpd-c.c b/frysk-core/frysk/pkglibdir/hpd-c.c
index 91d194c..6c3711c 100644
--- a/frysk-core/frysk/pkglibdir/hpd-c.c
+++ b/frysk-core/frysk/pkglibdir/hpd-c.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Action.java b/frysk-core/frysk/proc/Action.java
index c9267e6..ef4b6fa 100644
--- a/frysk-core/frysk/proc/Action.java
+++ b/frysk-core/frysk/proc/Action.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Auxv.java b/frysk-core/frysk/proc/Auxv.java
index 585b8ed..2ff8591 100644
--- a/frysk-core/frysk/proc/Auxv.java
+++ b/frysk-core/frysk/proc/Auxv.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Environ.java b/frysk-core/frysk/proc/Environ.java
index dd8dd0d..08fbe59 100644
--- a/frysk-core/frysk/proc/Environ.java
+++ b/frysk-core/frysk/proc/Environ.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/FindProc.java b/frysk-core/frysk/proc/FindProc.java
index cb9d748..d00da71 100644
--- a/frysk-core/frysk/proc/FindProc.java
+++ b/frysk-core/frysk/proc/FindProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index ad05c6f..f953c00 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/HostEvent.java b/frysk-core/frysk/proc/HostEvent.java
index e6ccf47..f04942b 100644
--- a/frysk-core/frysk/proc/HostEvent.java
+++ b/frysk-core/frysk/proc/HostEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/HostRefreshBuilder.java b/frysk-core/frysk/proc/HostRefreshBuilder.java
index 5d91e21..2d7626f 100644
--- a/frysk-core/frysk/proc/HostRefreshBuilder.java
+++ b/frysk-core/frysk/proc/HostRefreshBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Manager.java b/frysk-core/frysk/proc/Manager.java
index b8d8075..05dc625 100644
--- a/frysk-core/frysk/proc/Manager.java
+++ b/frysk-core/frysk/proc/Manager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/MemoryMap.java b/frysk-core/frysk/proc/MemoryMap.java
index 5a033b7..6a1d004 100644
--- a/frysk-core/frysk/proc/MemoryMap.java
+++ b/frysk-core/frysk/proc/MemoryMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Observable.java b/frysk-core/frysk/proc/Observable.java
index 248378c..7589274 100644
--- a/frysk-core/frysk/proc/Observable.java
+++ b/frysk-core/frysk/proc/Observable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Observation.java b/frysk-core/frysk/proc/Observation.java
index 4ce1a12..23afd89 100644
--- a/frysk-core/frysk/proc/Observation.java
+++ b/frysk-core/frysk/proc/Observation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Observer.java b/frysk-core/frysk/proc/Observer.java
index cb0a649..e510b4d 100644
--- a/frysk-core/frysk/proc/Observer.java
+++ b/frysk-core/frysk/proc/Observer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java
index cbeb823..5cce877 100644
--- a/frysk-core/frysk/proc/Proc.java
+++ b/frysk-core/frysk/proc/Proc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/ProcBlockAction.java b/frysk-core/frysk/proc/ProcBlockAction.java
index 66f3055..1f62fad 100644
--- a/frysk-core/frysk/proc/ProcBlockAction.java
+++ b/frysk-core/frysk/proc/ProcBlockAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/ProcBlockObserver.java b/frysk-core/frysk/proc/ProcBlockObserver.java
index e78496b..8333ac7 100644
--- a/frysk-core/frysk/proc/ProcBlockObserver.java
+++ b/frysk-core/frysk/proc/ProcBlockObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/ProcEvent.java b/frysk-core/frysk/proc/ProcEvent.java
index 215d20a..e11077b 100644
--- a/frysk-core/frysk/proc/ProcEvent.java
+++ b/frysk-core/frysk/proc/ProcEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/ProcEventObservable.java b/frysk-core/frysk/proc/ProcEventObservable.java
index 661e9e8..0c5bb5f 100644
--- a/frysk-core/frysk/proc/ProcEventObservable.java
+++ b/frysk-core/frysk/proc/ProcEventObservable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/ProcTasksAction.java b/frysk-core/frysk/proc/ProcTasksAction.java
index 86321a9..1c59e7c 100644
--- a/frysk-core/frysk/proc/ProcTasksAction.java
+++ b/frysk-core/frysk/proc/ProcTasksAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/ProcTasksObserver.java b/frysk-core/frysk/proc/ProcTasksObserver.java
index d8d921a..77c29d0 100644
--- a/frysk-core/frysk/proc/ProcTasksObserver.java
+++ b/frysk-core/frysk/proc/ProcTasksObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/StressAttachDetachManyTasks.java b/frysk-core/frysk/proc/StressAttachDetachManyTasks.java
index 07cce2a..434072f 100644
--- a/frysk-core/frysk/proc/StressAttachDetachManyTasks.java
+++ b/frysk-core/frysk/proc/StressAttachDetachManyTasks.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java b/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java
index 0235e85..e91ba5e 100644
--- a/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java
+++ b/frysk-core/frysk/proc/StressAttachDetachRapidlyCloningMainTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/StressAttachDetachRapidlyForkingMainTask.java b/frysk-core/frysk/proc/StressAttachDetachRapidlyForkingMainTask.java
index dd0d22b..897c404 100644
--- a/frysk-core/frysk/proc/StressAttachDetachRapidlyForkingMainTask.java
+++ b/frysk-core/frysk/proc/StressAttachDetachRapidlyForkingMainTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java b/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java
index ecea5a9..4316a3d 100644
--- a/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java
+++ b/frysk-core/frysk/proc/StressAttachDetachSignaledTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/StressTestAbandon.java b/frysk-core/frysk/proc/StressTestAbandon.java
index ec5ba01..dca3a12 100644
--- a/frysk-core/frysk/proc/StressTestAbandon.java
+++ b/frysk-core/frysk/proc/StressTestAbandon.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index 0858a8e..1c45711 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TaskAttachedObserverXXX.java b/frysk-core/frysk/proc/TaskAttachedObserverXXX.java
index df24b1a..48d790e 100644
--- a/frysk-core/frysk/proc/TaskAttachedObserverXXX.java
+++ b/frysk-core/frysk/proc/TaskAttachedObserverXXX.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TaskEvent.java b/frysk-core/frysk/proc/TaskEvent.java
index df2c3d6..0c8b86c 100644
--- a/frysk-core/frysk/proc/TaskEvent.java
+++ b/frysk-core/frysk/proc/TaskEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TaskId.java b/frysk-core/frysk/proc/TaskId.java
index ac33b30..0b1e742 100644
--- a/frysk-core/frysk/proc/TaskId.java
+++ b/frysk-core/frysk/proc/TaskId.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TaskObserver.java b/frysk-core/frysk/proc/TaskObserver.java
index ecc005e..8f73302 100644
--- a/frysk-core/frysk/proc/TaskObserver.java
+++ b/frysk-core/frysk/proc/TaskObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestAbandon.java b/frysk-core/frysk/proc/TestAbandon.java
index 5252525..578855c 100644
--- a/frysk-core/frysk/proc/TestAbandon.java
+++ b/frysk-core/frysk/proc/TestAbandon.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestBreakpoints.java b/frysk-core/frysk/proc/TestBreakpoints.java
index 3e6e2ff..4390902 100644
--- a/frysk-core/frysk/proc/TestBreakpoints.java
+++ b/frysk-core/frysk/proc/TestBreakpoints.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestComparable.java b/frysk-core/frysk/proc/TestComparable.java
index 2ddc6e5..5c35064 100644
--- a/frysk-core/frysk/proc/TestComparable.java
+++ b/frysk-core/frysk/proc/TestComparable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestEnviron.java b/frysk-core/frysk/proc/TestEnviron.java
index 38b026c..0dc3078 100644
--- a/frysk-core/frysk/proc/TestEnviron.java
+++ b/frysk-core/frysk/proc/TestEnviron.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestExec.java b/frysk-core/frysk/proc/TestExec.java
index 6c3037b..0f59fcd 100644
--- a/frysk-core/frysk/proc/TestExec.java
+++ b/frysk-core/frysk/proc/TestExec.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestFindProc.java b/frysk-core/frysk/proc/TestFindProc.java
index d9326b5..3596a52 100644
--- a/frysk-core/frysk/proc/TestFindProc.java
+++ b/frysk-core/frysk/proc/TestFindProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestHostGet.java b/frysk-core/frysk/proc/TestHostGet.java
index 46b9cfe..0f7aac2 100644
--- a/frysk-core/frysk/proc/TestHostGet.java
+++ b/frysk-core/frysk/proc/TestHostGet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestInstructions.java b/frysk-core/frysk/proc/TestInstructions.java
index a9eb2a4..0ff3a81 100644
--- a/frysk-core/frysk/proc/TestInstructions.java
+++ b/frysk-core/frysk/proc/TestInstructions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestMapGet.java b/frysk-core/frysk/proc/TestMapGet.java
index 9706fb0..2d68ff1 100644
--- a/frysk-core/frysk/proc/TestMapGet.java
+++ b/frysk-core/frysk/proc/TestMapGet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestProcForceDetach.java b/frysk-core/frysk/proc/TestProcForceDetach.java
index dadd744..8027a09 100644
--- a/frysk-core/frysk/proc/TestProcForceDetach.java
+++ b/frysk-core/frysk/proc/TestProcForceDetach.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestProcGet.java b/frysk-core/frysk/proc/TestProcGet.java
index 34b777a..2c58ef2 100644
--- a/frysk-core/frysk/proc/TestProcGet.java
+++ b/frysk-core/frysk/proc/TestProcGet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestProcTasksObserver.java b/frysk-core/frysk/proc/TestProcTasksObserver.java
index 738a657..2e5092c 100644
--- a/frysk-core/frysk/proc/TestProcTasksObserver.java
+++ b/frysk-core/frysk/proc/TestProcTasksObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestRun.java b/frysk-core/frysk/proc/TestRun.java
index 9907049..c966d13 100644
--- a/frysk-core/frysk/proc/TestRun.java
+++ b/frysk-core/frysk/proc/TestRun.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestSyscallRunning.java b/frysk-core/frysk/proc/TestSyscallRunning.java
index 266f455..60c32ca 100644
--- a/frysk-core/frysk/proc/TestSyscallRunning.java
+++ b/frysk-core/frysk/proc/TestSyscallRunning.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestSyscallSignal.java b/frysk-core/frysk/proc/TestSyscallSignal.java
index dca055a..4b032b7 100644
--- a/frysk-core/frysk/proc/TestSyscallSignal.java
+++ b/frysk-core/frysk/proc/TestSyscallSignal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskClonedObserver.java b/frysk-core/frysk/proc/TestTaskClonedObserver.java
index 11f0fbd..74e7dff 100644
--- a/frysk-core/frysk/proc/TestTaskClonedObserver.java
+++ b/frysk-core/frysk/proc/TestTaskClonedObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskForkedObserver.java b/frysk-core/frysk/proc/TestTaskForkedObserver.java
index ada14bd..2cd0b4f 100644
--- a/frysk-core/frysk/proc/TestTaskForkedObserver.java
+++ b/frysk-core/frysk/proc/TestTaskForkedObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskObserver.java b/frysk-core/frysk/proc/TestTaskObserver.java
index 509b11f..eb7f11e 100644
--- a/frysk-core/frysk/proc/TestTaskObserver.java
+++ b/frysk-core/frysk/proc/TestTaskObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskObserverDetach.java b/frysk-core/frysk/proc/TestTaskObserverDetach.java
index 5cc4792..aa50b27 100644
--- a/frysk-core/frysk/proc/TestTaskObserverDetach.java
+++ b/frysk-core/frysk/proc/TestTaskObserverDetach.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskObserverInstruction.java b/frysk-core/frysk/proc/TestTaskObserverInstruction.java
index bef491a..b112443 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstruction.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstruction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java b/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java
index 69b4297..b9aa451 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstructionAndCode.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java b/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java
index d69ca6a..e4c33b4 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstructionSigReturn.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java b/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java
index 30a58da..64b34b9 100644
--- a/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java
+++ b/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskSyscallObserver.java b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
index 2968ee1..4410a68 100644
--- a/frysk-core/frysk/proc/TestTaskSyscallObserver.java
+++ b/frysk-core/frysk/proc/TestTaskSyscallObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/TestTaskTerminateObserver.java b/frysk-core/frysk/proc/TestTaskTerminateObserver.java
index ffb1a61..5249950 100644
--- a/frysk-core/frysk/proc/TestTaskTerminateObserver.java
+++ b/frysk-core/frysk/proc/TestTaskTerminateObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/CorefileByteBuffer.java b/frysk-core/frysk/proc/dead/CorefileByteBuffer.java
index 86274e6..d520f81 100644
--- a/frysk-core/frysk/proc/dead/CorefileByteBuffer.java
+++ b/frysk-core/frysk/proc/dead/CorefileByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/CorefileRegisterBanksFactory.java b/frysk-core/frysk/proc/dead/CorefileRegisterBanksFactory.java
index 1b0f7ff..abe9e95 100644
--- a/frysk-core/frysk/proc/dead/CorefileRegisterBanksFactory.java
+++ b/frysk-core/frysk/proc/dead/CorefileRegisterBanksFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/CorefileStatus.java b/frysk-core/frysk/proc/dead/CorefileStatus.java
index b99e1fc..86935a6 100644
--- a/frysk-core/frysk/proc/dead/CorefileStatus.java
+++ b/frysk-core/frysk/proc/dead/CorefileStatus.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/DeadHost.java b/frysk-core/frysk/proc/dead/DeadHost.java
index 9d2075b..0c9d51c 100644
--- a/frysk-core/frysk/proc/dead/DeadHost.java
+++ b/frysk-core/frysk/proc/dead/DeadHost.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/DeadProc.java b/frysk-core/frysk/proc/dead/DeadProc.java
index a96c5fc..6af60a7 100644
--- a/frysk-core/frysk/proc/dead/DeadProc.java
+++ b/frysk-core/frysk/proc/dead/DeadProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/DeadTask.java b/frysk-core/frysk/proc/dead/DeadTask.java
index a9e1e98..d07f7e3 100644
--- a/frysk-core/frysk/proc/dead/DeadTask.java
+++ b/frysk-core/frysk/proc/dead/DeadTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/ExeByteBuffer.java b/frysk-core/frysk/proc/dead/ExeByteBuffer.java
index 59f6d09..75ab453 100644
--- a/frysk-core/frysk/proc/dead/ExeByteBuffer.java
+++ b/frysk-core/frysk/proc/dead/ExeByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/InterpreterFactory.java b/frysk-core/frysk/proc/dead/InterpreterFactory.java
index a325a0e..a4af1dc 100644
--- a/frysk-core/frysk/proc/dead/InterpreterFactory.java
+++ b/frysk-core/frysk/proc/dead/InterpreterFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinkmapBuilder.java b/frysk-core/frysk/proc/dead/LinkmapBuilder.java
index 011d93c..b04e054c 100644
--- a/frysk-core/frysk/proc/dead/LinkmapBuilder.java
+++ b/frysk-core/frysk/proc/dead/LinkmapBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreFactory.java b/frysk-core/frysk/proc/dead/LinuxCoreFactory.java
index 7453127..ffa8803 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreFactory.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreHost.java b/frysk-core/frysk/proc/dead/LinuxCoreHost.java
index 43749cb..7fcee8a 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreHost.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreHost.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreInfo.java b/frysk-core/frysk/proc/dead/LinuxCoreInfo.java
index 08248af..ca4e37c 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreInfo.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreInfo.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreProc.java b/frysk-core/frysk/proc/dead/LinuxCoreProc.java
index 7a46b8d..5a8bd7c 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreTask.java b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
index c537e1f..6342885 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxExeFactory.java b/frysk-core/frysk/proc/dead/LinuxExeFactory.java
index be6248f..cc5b268 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeFactory.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxExeHost.java b/frysk-core/frysk/proc/dead/LinuxExeHost.java
index 59f13e3..cae2bde 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeHost.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeHost.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxExeProc.java b/frysk-core/frysk/proc/dead/LinuxExeProc.java
index a7342e1..1f62f66 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/LinuxExeTask.java b/frysk-core/frysk/proc/dead/LinuxExeTask.java
index a762769..b6150ee 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/MapAddressHeader.java b/frysk-core/frysk/proc/dead/MapAddressHeader.java
index 381c8e0..9a0e7f2 100644
--- a/frysk-core/frysk/proc/dead/MapAddressHeader.java
+++ b/frysk-core/frysk/proc/dead/MapAddressHeader.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/TestCoreRegs.java b/frysk-core/frysk/proc/dead/TestCoreRegs.java
index 35aefa4..3fb3436 100644
--- a/frysk-core/frysk/proc/dead/TestCoreRegs.java
+++ b/frysk-core/frysk/proc/dead/TestCoreRegs.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java b/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java
index 47cbc97..30d2fb7 100644
--- a/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java
+++ b/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/TestInterpreter.java b/frysk-core/frysk/proc/dead/TestInterpreter.java
index bea01a5..c869c1e 100644
--- a/frysk-core/frysk/proc/dead/TestInterpreter.java
+++ b/frysk-core/frysk/proc/dead/TestInterpreter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/TestLinuxCore.java b/frysk-core/frysk/proc/dead/TestLinuxCore.java
index 9bd63d4..877085f 100644
--- a/frysk-core/frysk/proc/dead/TestLinuxCore.java
+++ b/frysk-core/frysk/proc/dead/TestLinuxCore.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dead/TestLinuxExe.java b/frysk-core/frysk/proc/dead/TestLinuxExe.java
index 8c467df..fcebb1b 100644
--- a/frysk-core/frysk/proc/dead/TestLinuxExe.java
+++ b/frysk-core/frysk/proc/dead/TestLinuxExe.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dummy/DummyHost.java b/frysk-core/frysk/proc/dummy/DummyHost.java
index 5afb229..896495a 100644
--- a/frysk-core/frysk/proc/dummy/DummyHost.java
+++ b/frysk-core/frysk/proc/dummy/DummyHost.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dummy/DummyProc.java b/frysk-core/frysk/proc/dummy/DummyProc.java
index 0c6b76c..318b3cb 100644
--- a/frysk-core/frysk/proc/dummy/DummyProc.java
+++ b/frysk-core/frysk/proc/dummy/DummyProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/dummy/DummyTask.java b/frysk-core/frysk/proc/dummy/DummyTask.java
index cbf939a..e89485f 100644
--- a/frysk-core/frysk/proc/dummy/DummyTask.java
+++ b/frysk-core/frysk/proc/dummy/DummyTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/BlockSpaceByteBuffer.java b/frysk-core/frysk/proc/live/BlockSpaceByteBuffer.java
index 84b2c8a..0b9859d 100644
--- a/frysk-core/frysk/proc/live/BlockSpaceByteBuffer.java
+++ b/frysk-core/frysk/proc/live/BlockSpaceByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/Breakpoint.java b/frysk-core/frysk/proc/live/Breakpoint.java
index 54ea21f..2383b4a 100644
--- a/frysk-core/frysk/proc/live/Breakpoint.java
+++ b/frysk-core/frysk/proc/live/Breakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/BreakpointAddresses.java b/frysk-core/frysk/proc/live/BreakpointAddresses.java
index 4564d40..1c4239c 100644
--- a/frysk-core/frysk/proc/live/BreakpointAddresses.java
+++ b/frysk-core/frysk/proc/live/BreakpointAddresses.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/ByteSpaceByteBuffer.java b/frysk-core/frysk/proc/live/ByteSpaceByteBuffer.java
index 7cd405e..0876f30 100644
--- a/frysk-core/frysk/proc/live/ByteSpaceByteBuffer.java
+++ b/frysk-core/frysk/proc/live/ByteSpaceByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/IA32InstructionParser.java b/frysk-core/frysk/proc/live/IA32InstructionParser.java
index 8285b12..c256d73 100644
--- a/frysk-core/frysk/proc/live/IA32InstructionParser.java
+++ b/frysk-core/frysk/proc/live/IA32InstructionParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/Instruction.java b/frysk-core/frysk/proc/live/Instruction.java
index 6a62978..141c15c 100644
--- a/frysk-core/frysk/proc/live/Instruction.java
+++ b/frysk-core/frysk/proc/live/Instruction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/Isa.java b/frysk-core/frysk/proc/live/Isa.java
index 41bb1c0..a4b58e3 100644
--- a/frysk-core/frysk/proc/live/Isa.java
+++ b/frysk-core/frysk/proc/live/Isa.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/IsaFactory.java b/frysk-core/frysk/proc/live/IsaFactory.java
index f929777..e248b8b 100644
--- a/frysk-core/frysk/proc/live/IsaFactory.java
+++ b/frysk-core/frysk/proc/live/IsaFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/IsaPowerPC.java b/frysk-core/frysk/proc/live/IsaPowerPC.java
index a69ca46..74306fb 100644
--- a/frysk-core/frysk/proc/live/IsaPowerPC.java
+++ b/frysk-core/frysk/proc/live/IsaPowerPC.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxIA32.java b/frysk-core/frysk/proc/live/LinuxIA32.java
index fe11aa5..f68943b 100644
--- a/frysk-core/frysk/proc/live/LinuxIA32.java
+++ b/frysk-core/frysk/proc/live/LinuxIA32.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPPC32.java b/frysk-core/frysk/proc/live/LinuxPPC32.java
index 60c0400..fdefef2 100644
--- a/frysk-core/frysk/proc/live/LinuxPPC32.java
+++ b/frysk-core/frysk/proc/live/LinuxPPC32.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPPC64.java b/frysk-core/frysk/proc/live/LinuxPPC64.java
index d26cc43..9f8d269 100644
--- a/frysk-core/frysk/proc/live/LinuxPPC64.java
+++ b/frysk-core/frysk/proc/live/LinuxPPC64.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceHost.java b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
index 1c10aab..ffccf7b 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceHost.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
index 209969b..3714b90 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
index 665c529..adbfc16 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index 8dc5c78..1d8347f 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index 8a017fa..10f8d1a 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxWaitBuilder.java b/frysk-core/frysk/proc/live/LinuxWaitBuilder.java
index 0943eb9..71fb0b8 100644
--- a/frysk-core/frysk/proc/live/LinuxWaitBuilder.java
+++ b/frysk-core/frysk/proc/live/LinuxWaitBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LinuxX8664.java b/frysk-core/frysk/proc/live/LinuxX8664.java
index 8ee4876..48dedce 100644
--- a/frysk-core/frysk/proc/live/LinuxX8664.java
+++ b/frysk-core/frysk/proc/live/LinuxX8664.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LiveHost.java b/frysk-core/frysk/proc/live/LiveHost.java
index f57dfbe..f8ee77e 100644
--- a/frysk-core/frysk/proc/live/LiveHost.java
+++ b/frysk-core/frysk/proc/live/LiveHost.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LiveProc.java b/frysk-core/frysk/proc/live/LiveProc.java
index 9d46f0e..115a919 100644
--- a/frysk-core/frysk/proc/live/LiveProc.java
+++ b/frysk-core/frysk/proc/live/LiveProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LiveTask.java b/frysk-core/frysk/proc/live/LiveTask.java
index 7c4d90f..bb152c7 100644
--- a/frysk-core/frysk/proc/live/LiveTask.java
+++ b/frysk-core/frysk/proc/live/LiveTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/LogicalMemoryBuffer.java b/frysk-core/frysk/proc/live/LogicalMemoryBuffer.java
index 3227a5f..428f515 100644
--- a/frysk-core/frysk/proc/live/LogicalMemoryBuffer.java
+++ b/frysk-core/frysk/proc/live/LogicalMemoryBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java b/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java
index dea7c53..2e1bb28 100644
--- a/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java
+++ b/frysk-core/frysk/proc/live/PtraceRegisterBanksFactory.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/State.java b/frysk-core/frysk/proc/live/State.java
index 95d2052..bdb187a 100644
--- a/frysk-core/frysk/proc/live/State.java
+++ b/frysk-core/frysk/proc/live/State.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TaskObservable.java b/frysk-core/frysk/proc/live/TaskObservable.java
index ee32e75..f8dc6dd 100644
--- a/frysk-core/frysk/proc/live/TaskObservable.java
+++ b/frysk-core/frysk/proc/live/TaskObservable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TaskObservation.java b/frysk-core/frysk/proc/live/TaskObservation.java
index da9b9d8..4f9f926 100644
--- a/frysk-core/frysk/proc/live/TaskObservation.java
+++ b/frysk-core/frysk/proc/live/TaskObservation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestByteBuffer.java b/frysk-core/frysk/proc/live/TestByteBuffer.java
index f318b90..4e12ebd 100644
--- a/frysk-core/frysk/proc/live/TestByteBuffer.java
+++ b/frysk-core/frysk/proc/live/TestByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestProcStopped.java b/frysk-core/frysk/proc/live/TestProcStopped.java
index 8ff19d6..fd52167 100644
--- a/frysk-core/frysk/proc/live/TestProcStopped.java
+++ b/frysk-core/frysk/proc/live/TestProcStopped.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestRefresh.java b/frysk-core/frysk/proc/live/TestRefresh.java
index 2b14f1a..eafbb4f 100644
--- a/frysk-core/frysk/proc/live/TestRefresh.java
+++ b/frysk-core/frysk/proc/live/TestRefresh.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestRegs.java b/frysk-core/frysk/proc/live/TestRegs.java
index de7a7fe..3c33496 100644
--- a/frysk-core/frysk/proc/live/TestRegs.java
+++ b/frysk-core/frysk/proc/live/TestRegs.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestRuntimeIsa.java b/frysk-core/frysk/proc/live/TestRuntimeIsa.java
index 968c901..468e9b1 100644
--- a/frysk-core/frysk/proc/live/TestRuntimeIsa.java
+++ b/frysk-core/frysk/proc/live/TestRuntimeIsa.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java b/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java
index 254b4a6..0f1f549 100644
--- a/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java
+++ b/frysk-core/frysk/proc/live/TestTaskObserverBlocked.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/TestTaskObserverCode.java b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
index 064d73d..5d1571a 100644
--- a/frysk-core/frysk/proc/live/TestTaskObserverCode.java
+++ b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/Watchpoint.java b/frysk-core/frysk/proc/live/Watchpoint.java
index 86d1e00..caeffc8 100644
--- a/frysk-core/frysk/proc/live/Watchpoint.java
+++ b/frysk-core/frysk/proc/live/Watchpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/WatchpointAddresses.java b/frysk-core/frysk/proc/live/WatchpointAddresses.java
index 2b1bee4..a28f163 100644
--- a/frysk-core/frysk/proc/live/WatchpointAddresses.java
+++ b/frysk-core/frysk/proc/live/WatchpointAddresses.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/proc/live/X8664InstructionParser.java b/frysk-core/frysk/proc/live/X8664InstructionParser.java
index 73fbaeb..6b96d0e 100644
--- a/frysk-core/frysk/proc/live/X8664InstructionParser.java
+++ b/frysk-core/frysk/proc/live/X8664InstructionParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/Breakpoint.java b/frysk-core/frysk/rt/Breakpoint.java
index 13c205f..9b7af73 100644
--- a/frysk-core/frysk/rt/Breakpoint.java
+++ b/frysk-core/frysk/rt/Breakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/BreakpointManager.java b/frysk-core/frysk/rt/BreakpointManager.java
index 3a70760..c465c99 100644
--- a/frysk-core/frysk/rt/BreakpointManager.java
+++ b/frysk-core/frysk/rt/BreakpointManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/BreakpointObserver.java b/frysk-core/frysk/rt/BreakpointObserver.java
index 6c6c942..5ebc5de 100644
--- a/frysk-core/frysk/rt/BreakpointObserver.java
+++ b/frysk-core/frysk/rt/BreakpointObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/CountManager.java b/frysk-core/frysk/rt/CountManager.java
index f6b93e4..bec13c4 100644
--- a/frysk-core/frysk/rt/CountManager.java
+++ b/frysk-core/frysk/rt/CountManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/DisplayManager.java b/frysk-core/frysk/rt/DisplayManager.java
index 48beefb..67074e6 100644
--- a/frysk-core/frysk/rt/DisplayManager.java
+++ b/frysk-core/frysk/rt/DisplayManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/DisplayValue.java b/frysk-core/frysk/rt/DisplayValue.java
index 49acd32..f460701 100644
--- a/frysk-core/frysk/rt/DisplayValue.java
+++ b/frysk-core/frysk/rt/DisplayValue.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/DisplayValueObserver.java b/frysk-core/frysk/rt/DisplayValueObserver.java
index 6571fad..68a7f4d 100644
--- a/frysk-core/frysk/rt/DisplayValueObserver.java
+++ b/frysk-core/frysk/rt/DisplayValueObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/FunctionBreakpoint.java b/frysk-core/frysk/rt/FunctionBreakpoint.java
index b7141a5..1e1874a 100644
--- a/frysk-core/frysk/rt/FunctionBreakpoint.java
+++ b/frysk-core/frysk/rt/FunctionBreakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/LineBreakpoint.java b/frysk-core/frysk/rt/LineBreakpoint.java
index d9ec7ea..89c5c17 100644
--- a/frysk-core/frysk/rt/LineBreakpoint.java
+++ b/frysk-core/frysk/rt/LineBreakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/PLTBreakpoint.java b/frysk-core/frysk/rt/PLTBreakpoint.java
index 9a86874..7ed9e55 100644
--- a/frysk-core/frysk/rt/PLTBreakpoint.java
+++ b/frysk-core/frysk/rt/PLTBreakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/ProcTaskIDManager.java b/frysk-core/frysk/rt/ProcTaskIDManager.java
index 6e28f24..da0a5af 100644
--- a/frysk-core/frysk/rt/ProcTaskIDManager.java
+++ b/frysk-core/frysk/rt/ProcTaskIDManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/SourceBreakpoint.java b/frysk-core/frysk/rt/SourceBreakpoint.java
index 2b3a397..eec1693 100644
--- a/frysk-core/frysk/rt/SourceBreakpoint.java
+++ b/frysk-core/frysk/rt/SourceBreakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/SourceBreakpointObserver.java b/frysk-core/frysk/rt/SourceBreakpointObserver.java
index 6692acb..44922fd 100644
--- a/frysk-core/frysk/rt/SourceBreakpointObserver.java
+++ b/frysk-core/frysk/rt/SourceBreakpointObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/SymbolBreakpoint.java b/frysk-core/frysk/rt/SymbolBreakpoint.java
index a8a63b3..f079b24 100644
--- a/frysk-core/frysk/rt/SymbolBreakpoint.java
+++ b/frysk-core/frysk/rt/SymbolBreakpoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/TestDisplayValue.java b/frysk-core/frysk/rt/TestDisplayValue.java
index 0db1014..a728492 100644
--- a/frysk-core/frysk/rt/TestDisplayValue.java
+++ b/frysk-core/frysk/rt/TestDisplayValue.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/TestUpdatingDisplayValue.java b/frysk-core/frysk/rt/TestUpdatingDisplayValue.java
index 61382fe..fe8adf0 100644
--- a/frysk-core/frysk/rt/TestUpdatingDisplayValue.java
+++ b/frysk-core/frysk/rt/TestUpdatingDisplayValue.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/UpdatingDisplayValue.java b/frysk-core/frysk/rt/UpdatingDisplayValue.java
index c4ca406..f7dd754 100644
--- a/frysk-core/frysk/rt/UpdatingDisplayValue.java
+++ b/frysk-core/frysk/rt/UpdatingDisplayValue.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/rt/WatchObserverInstaller.java b/frysk-core/frysk/rt/WatchObserverInstaller.java
index 1d376b3..b51b201 100644
--- a/frysk-core/frysk/rt/WatchObserverInstaller.java
+++ b/frysk-core/frysk/rt/WatchObserverInstaller.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/Composite.java b/frysk-core/frysk/scopes/Composite.java
index 31f250a..6eaaf72 100644
--- a/frysk-core/frysk/scopes/Composite.java
+++ b/frysk-core/frysk/scopes/Composite.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/ConcreteInlinedFunction.java b/frysk-core/frysk/scopes/ConcreteInlinedFunction.java
index 9467846..299efc9 100644
--- a/frysk-core/frysk/scopes/ConcreteInlinedFunction.java
+++ b/frysk-core/frysk/scopes/ConcreteInlinedFunction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/Enumeration.java b/frysk-core/frysk/scopes/Enumeration.java
index 5d174e7..6fc36ad 100644
--- a/frysk-core/frysk/scopes/Enumeration.java
+++ b/frysk-core/frysk/scopes/Enumeration.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/Enumerator.java b/frysk-core/frysk/scopes/Enumerator.java
index ea17b46..508f44b 100644
--- a/frysk-core/frysk/scopes/Enumerator.java
+++ b/frysk-core/frysk/scopes/Enumerator.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/Function.java b/frysk-core/frysk/scopes/Function.java
index cc4c426..cb36989 100644
--- a/frysk-core/frysk/scopes/Function.java
+++ b/frysk-core/frysk/scopes/Function.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/InlinedFunction.java b/frysk-core/frysk/scopes/InlinedFunction.java
index 2e8cb2e..207395c 100644
--- a/frysk-core/frysk/scopes/InlinedFunction.java
+++ b/frysk-core/frysk/scopes/InlinedFunction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/LexicalBlock.java b/frysk-core/frysk/scopes/LexicalBlock.java
index b5e5a49..060c57c 100644
--- a/frysk-core/frysk/scopes/LexicalBlock.java
+++ b/frysk-core/frysk/scopes/LexicalBlock.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/NamedScope.java b/frysk-core/frysk/scopes/NamedScope.java
index 915ab59..04c4611 100644
--- a/frysk-core/frysk/scopes/NamedScope.java
+++ b/frysk-core/frysk/scopes/NamedScope.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/OutOfLineFunction.java b/frysk-core/frysk/scopes/OutOfLineFunction.java
index 4b71275..77bdef1 100644
--- a/frysk-core/frysk/scopes/OutOfLineFunction.java
+++ b/frysk-core/frysk/scopes/OutOfLineFunction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/Scope.java b/frysk-core/frysk/scopes/Scope.java
index 088ce72..cb97903 100644
--- a/frysk-core/frysk/scopes/Scope.java
+++ b/frysk-core/frysk/scopes/Scope.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/ScopeFactory.java b/frysk-core/frysk/scopes/ScopeFactory.java
index 9b87af7..633e689 100644
--- a/frysk-core/frysk/scopes/ScopeFactory.java
+++ b/frysk-core/frysk/scopes/ScopeFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/SourceLocation.java b/frysk-core/frysk/scopes/SourceLocation.java
index 74ef428..d763852 100644
--- a/frysk-core/frysk/scopes/SourceLocation.java
+++ b/frysk-core/frysk/scopes/SourceLocation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/SourceLocationFactory.java b/frysk-core/frysk/scopes/SourceLocationFactory.java
index 17e7f3a..73f5cd3 100644
--- a/frysk-core/frysk/scopes/SourceLocationFactory.java
+++ b/frysk-core/frysk/scopes/SourceLocationFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/TestDie.java b/frysk-core/frysk/scopes/TestDie.java
index 44bf505..dfce0dd 100644
--- a/frysk-core/frysk/scopes/TestDie.java
+++ b/frysk-core/frysk/scopes/TestDie.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/TestScopeFactory.java b/frysk-core/frysk/scopes/TestScopeFactory.java
index 065e2ab..20878e0 100644
--- a/frysk-core/frysk/scopes/TestScopeFactory.java
+++ b/frysk-core/frysk/scopes/TestScopeFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/TestScopes.java b/frysk-core/frysk/scopes/TestScopes.java
index 0d13d1e..6772c19 100644
--- a/frysk-core/frysk/scopes/TestScopes.java
+++ b/frysk-core/frysk/scopes/TestScopes.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/scopes/Variable.java b/frysk-core/frysk/scopes/Variable.java
index 6aa55ef..cc12c0f 100644
--- a/frysk-core/frysk/scopes/Variable.java
+++ b/frysk-core/frysk/scopes/Variable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/solib/DynamicSegment.java b/frysk-core/frysk/solib/DynamicSegment.java
index d9a98c5..89fd88c 100644
--- a/frysk-core/frysk/solib/DynamicSegment.java
+++ b/frysk-core/frysk/solib/DynamicSegment.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/solib/LinkMap.java b/frysk-core/frysk/solib/LinkMap.java
index 1d6fdd0..e6d867d 100644
--- a/frysk-core/frysk/solib/LinkMap.java
+++ b/frysk-core/frysk/solib/LinkMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/solib/LinkMapFactory.java b/frysk-core/frysk/solib/LinkMapFactory.java
index 7b72ed5..6c87a65 100644
--- a/frysk-core/frysk/solib/LinkMapFactory.java
+++ b/frysk-core/frysk/solib/LinkMapFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/solib/MemoryMapFactory.java b/frysk-core/frysk/solib/MemoryMapFactory.java
index 87b694b..289a490 100644
--- a/frysk-core/frysk/solib/MemoryMapFactory.java
+++ b/frysk-core/frysk/solib/MemoryMapFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/solib/SOLibMapBuilder.java b/frysk-core/frysk/solib/SOLibMapBuilder.java
index ddf8a90..2389f05 100644
--- a/frysk-core/frysk/solib/SOLibMapBuilder.java
+++ b/frysk-core/frysk/solib/SOLibMapBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/Frame.java b/frysk-core/frysk/stack/Frame.java
index 6ba3dc1..13de822 100644
--- a/frysk-core/frysk/stack/Frame.java
+++ b/frysk-core/frysk/stack/Frame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/FrameDecorator.java b/frysk-core/frysk/stack/FrameDecorator.java
index 38c6f09..5ffcb89 100644
--- a/frysk-core/frysk/stack/FrameDecorator.java
+++ b/frysk-core/frysk/stack/FrameDecorator.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/FrameIdentifier.java b/frysk-core/frysk/stack/FrameIdentifier.java
index f85473d..65e1607 100644
--- a/frysk-core/frysk/stack/FrameIdentifier.java
+++ b/frysk-core/frysk/stack/FrameIdentifier.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/FrameLevel.java b/frysk-core/frysk/stack/FrameLevel.java
index e8400f8..0383fcc 100644
--- a/frysk-core/frysk/stack/FrameLevel.java
+++ b/frysk-core/frysk/stack/FrameLevel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/LibunwindAddressSpace.java b/frysk-core/frysk/stack/LibunwindAddressSpace.java
index a85a6bb..3f935d8 100644
--- a/frysk-core/frysk/stack/LibunwindAddressSpace.java
+++ b/frysk-core/frysk/stack/LibunwindAddressSpace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/LibunwindFrame.java b/frysk-core/frysk/stack/LibunwindFrame.java
index 08ee6d3..2fe0cad 100644
--- a/frysk-core/frysk/stack/LibunwindFrame.java
+++ b/frysk-core/frysk/stack/LibunwindFrame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/LibunwindRegisterMapFactory.java b/frysk-core/frysk/stack/LibunwindRegisterMapFactory.java
index b20c864..b06a79e 100644
--- a/frysk-core/frysk/stack/LibunwindRegisterMapFactory.java
+++ b/frysk-core/frysk/stack/LibunwindRegisterMapFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/PrintStackOptions.java b/frysk-core/frysk/stack/PrintStackOptions.java
index 2e3f161..10837c7 100644
--- a/frysk-core/frysk/stack/PrintStackOptions.java
+++ b/frysk-core/frysk/stack/PrintStackOptions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/StackFactory.java b/frysk-core/frysk/stack/StackFactory.java
index c1e05e5..153e0ca 100644
--- a/frysk-core/frysk/stack/StackFactory.java
+++ b/frysk-core/frysk/stack/StackFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestFrame.java b/frysk-core/frysk/stack/TestFrame.java
index 9f33b7e..98f5499 100644
--- a/frysk-core/frysk/stack/TestFrame.java
+++ b/frysk-core/frysk/stack/TestFrame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestFrameIdentifier.java b/frysk-core/frysk/stack/TestFrameIdentifier.java
index d8512be..e496770 100644
--- a/frysk-core/frysk/stack/TestFrameIdentifier.java
+++ b/frysk-core/frysk/stack/TestFrameIdentifier.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestFrameLevel.java b/frysk-core/frysk/stack/TestFrameLevel.java
index 54dc85b..0d2ecc9 100644
--- a/frysk-core/frysk/stack/TestFrameLevel.java
+++ b/frysk-core/frysk/stack/TestFrameLevel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestFrameSymbol.java b/frysk-core/frysk/stack/TestFrameSymbol.java
index c5a8bde..be4d934 100644
--- a/frysk-core/frysk/stack/TestFrameSymbol.java
+++ b/frysk-core/frysk/stack/TestFrameSymbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestLibFunctionStepFrame.java b/frysk-core/frysk/stack/TestLibFunctionStepFrame.java
index 1a13bbb..4a9ae52 100644
--- a/frysk-core/frysk/stack/TestLibFunctionStepFrame.java
+++ b/frysk-core/frysk/stack/TestLibFunctionStepFrame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestRegs.java b/frysk-core/frysk/stack/TestRegs.java
index efe1d0a..205593b 100644
--- a/frysk-core/frysk/stack/TestRegs.java
+++ b/frysk-core/frysk/stack/TestRegs.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stack/TestSignalStepFrame.java b/frysk-core/frysk/stack/TestSignalStepFrame.java
index 43aa4e6..4ce8c18 100644
--- a/frysk-core/frysk/stack/TestSignalStepFrame.java
+++ b/frysk-core/frysk/stack/TestSignalStepFrame.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/InstructionStepState.java b/frysk-core/frysk/stepping/InstructionStepState.java
index 6e20c2f..079155c 100644
--- a/frysk-core/frysk/stepping/InstructionStepState.java
+++ b/frysk-core/frysk/stepping/InstructionStepState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/InstructionStepThroughState.java b/frysk-core/frysk/stepping/InstructionStepThroughState.java
index 9722127..99a3a4e 100644
--- a/frysk-core/frysk/stepping/InstructionStepThroughState.java
+++ b/frysk-core/frysk/stepping/InstructionStepThroughState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/LineStepState.java b/frysk-core/frysk/stepping/LineStepState.java
index f95a996..f1acb9c 100644
--- a/frysk-core/frysk/stepping/LineStepState.java
+++ b/frysk-core/frysk/stepping/LineStepState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/NextInstructionStepState.java b/frysk-core/frysk/stepping/NextInstructionStepState.java
index b26e55d..4cfddc8 100644
--- a/frysk-core/frysk/stepping/NextInstructionStepState.java
+++ b/frysk-core/frysk/stepping/NextInstructionStepState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/NextInstructionStepTestState.java b/frysk-core/frysk/stepping/NextInstructionStepTestState.java
index 7c0e8c8..d4771f3 100644
--- a/frysk-core/frysk/stepping/NextInstructionStepTestState.java
+++ b/frysk-core/frysk/stepping/NextInstructionStepTestState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/RunningState.java b/frysk-core/frysk/stepping/RunningState.java
index a1bf8ae..834a04e 100644
--- a/frysk-core/frysk/stepping/RunningState.java
+++ b/frysk-core/frysk/stepping/RunningState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/State.java b/frysk-core/frysk/stepping/State.java
index 40a0810..76a06b8 100644
--- a/frysk-core/frysk/stepping/State.java
+++ b/frysk-core/frysk/stepping/State.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/StepAdvanceState.java b/frysk-core/frysk/stepping/StepAdvanceState.java
index b724ab2..f1ebecc 100644
--- a/frysk-core/frysk/stepping/StepAdvanceState.java
+++ b/frysk-core/frysk/stepping/StepAdvanceState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/StepOutState.java b/frysk-core/frysk/stepping/StepOutState.java
index 5c5a44b..d51232c 100644
--- a/frysk-core/frysk/stepping/StepOutState.java
+++ b/frysk-core/frysk/stepping/StepOutState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/StepOverState.java b/frysk-core/frysk/stepping/StepOverState.java
index 7b2d0c2..258a4c6 100644
--- a/frysk-core/frysk/stepping/StepOverState.java
+++ b/frysk-core/frysk/stepping/StepOverState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/StepOverTestState.java b/frysk-core/frysk/stepping/StepOverTestState.java
index 5e7b38e..4cda162 100644
--- a/frysk-core/frysk/stepping/StepOverTestState.java
+++ b/frysk-core/frysk/stepping/StepOverTestState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/StepTerminatedState.java b/frysk-core/frysk/stepping/StepTerminatedState.java
index 4f87217..2388786 100644
--- a/frysk-core/frysk/stepping/StepTerminatedState.java
+++ b/frysk-core/frysk/stepping/StepTerminatedState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/SteppingEngine.java b/frysk-core/frysk/stepping/SteppingEngine.java
index 7dab132..7fb9b7d 100644
--- a/frysk-core/frysk/stepping/SteppingEngine.java
+++ b/frysk-core/frysk/stepping/SteppingEngine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/StoppedState.java b/frysk-core/frysk/stepping/StoppedState.java
index 8d4df58..68d7a8a 100644
--- a/frysk-core/frysk/stepping/StoppedState.java
+++ b/frysk-core/frysk/stepping/StoppedState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/TaskStepEngine.java b/frysk-core/frysk/stepping/TaskStepEngine.java
index be1cf4b..dd8ecc3 100644
--- a/frysk-core/frysk/stepping/TaskStepEngine.java
+++ b/frysk-core/frysk/stepping/TaskStepEngine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/TestFirstInstruction.java b/frysk-core/frysk/stepping/TestFirstInstruction.java
index e3a269b..0f7ee67 100644
--- a/frysk-core/frysk/stepping/TestFirstInstruction.java
+++ b/frysk-core/frysk/stepping/TestFirstInstruction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/TestStepping.java b/frysk-core/frysk/stepping/TestStepping.java
index 188a27f..8effd82 100644
--- a/frysk-core/frysk/stepping/TestStepping.java
+++ b/frysk-core/frysk/stepping/TestStepping.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/stepping/TestSteppingEngine.java b/frysk-core/frysk/stepping/TestSteppingEngine.java
index bbe5ad1..1b9e5e3 100644
--- a/frysk-core/frysk/stepping/TestSteppingEngine.java
+++ b/frysk-core/frysk/stepping/TestSteppingEngine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/DwflSymbol.java b/frysk-core/frysk/symtab/DwflSymbol.java
index e5931a4..1990192 100644
--- a/frysk-core/frysk/symtab/DwflSymbol.java
+++ b/frysk-core/frysk/symtab/DwflSymbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/ModuleMatcher.java b/frysk-core/frysk/symtab/ModuleMatcher.java
index ff91028..e250109 100644
--- a/frysk-core/frysk/symtab/ModuleMatcher.java
+++ b/frysk-core/frysk/symtab/ModuleMatcher.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/PLTEntry.java b/frysk-core/frysk/symtab/PLTEntry.java
index df31742..ab614e0 100644
--- a/frysk-core/frysk/symtab/PLTEntry.java
+++ b/frysk-core/frysk/symtab/PLTEntry.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/Symbol.java b/frysk-core/frysk/symtab/Symbol.java
index 246b711..5d0d333 100644
--- a/frysk-core/frysk/symtab/Symbol.java
+++ b/frysk-core/frysk/symtab/Symbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/SymbolFactory.java b/frysk-core/frysk/symtab/SymbolFactory.java
index 16d5f66..d19ca28 100644
--- a/frysk-core/frysk/symtab/SymbolFactory.java
+++ b/frysk-core/frysk/symtab/SymbolFactory.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/SymbolObjectDeclaration.java b/frysk-core/frysk/symtab/SymbolObjectDeclaration.java
index 3ad1f7c..1a58132 100644
--- a/frysk-core/frysk/symtab/SymbolObjectDeclaration.java
+++ b/frysk-core/frysk/symtab/SymbolObjectDeclaration.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/TestSymbol.java b/frysk-core/frysk/symtab/TestSymbol.java
index a0228b3..2156d8f 100644
--- a/frysk-core/frysk/symtab/TestSymbol.java
+++ b/frysk-core/frysk/symtab/TestSymbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/symtab/UnknownSymbol.java b/frysk-core/frysk/symtab/UnknownSymbol.java
index eb8b5b6..d839aae 100644
--- a/frysk-core/frysk/symtab/UnknownSymbol.java
+++ b/frysk-core/frysk/symtab/UnknownSymbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/sysroot/SysRoot.java b/frysk-core/frysk/sysroot/SysRoot.java
index 38c355a..5c92324 100644
--- a/frysk-core/frysk/sysroot/SysRoot.java
+++ b/frysk-core/frysk/sysroot/SysRoot.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/sysroot/SysRootCache.java b/frysk-core/frysk/sysroot/SysRootCache.java
index 1057198..8048dbb 100644
--- a/frysk-core/frysk/sysroot/SysRootCache.java
+++ b/frysk-core/frysk/sysroot/SysRootCache.java
@@ -11,8 +11,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/sysroot/SysRootFile.java b/frysk-core/frysk/sysroot/SysRootFile.java
index 9f43a9d..9654ad6 100644
--- a/frysk-core/frysk/sysroot/SysRootFile.java
+++ b/frysk-core/frysk/sysroot/SysRootFile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/sysroot/TestSysRoot.java b/frysk-core/frysk/sysroot/TestSysRoot.java
index 208f4a9..4784add 100644
--- a/frysk-core/frysk/sysroot/TestSysRoot.java
+++ b/frysk-core/frysk/sysroot/TestSysRoot.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/CoredumpAction.java b/frysk-core/frysk/testbed/CoredumpAction.java
index 90f5820..d77fdbb 100644
--- a/frysk-core/frysk/testbed/CoredumpAction.java
+++ b/frysk-core/frysk/testbed/CoredumpAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/CorefileFactory.java b/frysk-core/frysk/testbed/CorefileFactory.java
index 571869d..1fcfbb3 100644
--- a/frysk-core/frysk/testbed/CorefileFactory.java
+++ b/frysk-core/frysk/testbed/CorefileFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/DaemonBlockedAtEntry.java b/frysk-core/frysk/testbed/DaemonBlockedAtEntry.java
index 679f7c4..b17a574 100644
--- a/frysk-core/frysk/testbed/DaemonBlockedAtEntry.java
+++ b/frysk-core/frysk/testbed/DaemonBlockedAtEntry.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/DaemonBlockedAtSignal.java b/frysk-core/frysk/testbed/DaemonBlockedAtSignal.java
index e53b217..346cc6d 100644
--- a/frysk-core/frysk/testbed/DaemonBlockedAtSignal.java
+++ b/frysk-core/frysk/testbed/DaemonBlockedAtSignal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/ExecCommand.java b/frysk-core/frysk/testbed/ExecCommand.java
index a108fdf..7b067ef 100644
--- a/frysk-core/frysk/testbed/ExecCommand.java
+++ b/frysk-core/frysk/testbed/ExecCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/ExecOffspring.java b/frysk-core/frysk/testbed/ExecOffspring.java
index 4f24664..26aa4e6 100644
--- a/frysk-core/frysk/testbed/ExecOffspring.java
+++ b/frysk-core/frysk/testbed/ExecOffspring.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/Fibonacci.java b/frysk-core/frysk/testbed/Fibonacci.java
index 333977c..1492431 100644
--- a/frysk-core/frysk/testbed/Fibonacci.java
+++ b/frysk-core/frysk/testbed/Fibonacci.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/FryskAsm.java b/frysk-core/frysk/testbed/FryskAsm.java
index c08c65d..8ea64a8 100644
--- a/frysk-core/frysk/testbed/FryskAsm.java
+++ b/frysk-core/frysk/testbed/FryskAsm.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/FunitThreadsOffspring.java b/frysk-core/frysk/testbed/FunitThreadsOffspring.java
index 90e1e8c..be7a24a 100644
--- a/frysk-core/frysk/testbed/FunitThreadsOffspring.java
+++ b/frysk-core/frysk/testbed/FunitThreadsOffspring.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/IsaTestbed.java b/frysk-core/frysk/testbed/IsaTestbed.java
index daa6b53..1c84b46 100644
--- a/frysk-core/frysk/testbed/IsaTestbed.java
+++ b/frysk-core/frysk/testbed/IsaTestbed.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/LegacyOffspring.java b/frysk-core/frysk/testbed/LegacyOffspring.java
index e021fcb..5bef284 100644
--- a/frysk-core/frysk/testbed/LegacyOffspring.java
+++ b/frysk-core/frysk/testbed/LegacyOffspring.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/Offspring.java b/frysk-core/frysk/testbed/Offspring.java
index e4c3d0b..3ca72a9 100644
--- a/frysk-core/frysk/testbed/Offspring.java
+++ b/frysk-core/frysk/testbed/Offspring.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/OffspringType.java b/frysk-core/frysk/testbed/OffspringType.java
index 23739f5..1b22e35 100644
--- a/frysk-core/frysk/testbed/OffspringType.java
+++ b/frysk-core/frysk/testbed/OffspringType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/PidCounter.java b/frysk-core/frysk/testbed/PidCounter.java
index 717642e..f5169da 100644
--- a/frysk-core/frysk/testbed/PidCounter.java
+++ b/frysk-core/frysk/testbed/PidCounter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/RegsCase.java b/frysk-core/frysk/testbed/RegsCase.java
index 2a76ea9..685993c 100644
--- a/frysk-core/frysk/testbed/RegsCase.java
+++ b/frysk-core/frysk/testbed/RegsCase.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/SignalWaiter.java b/frysk-core/frysk/testbed/SignalWaiter.java
index 98c789d..7a1b95e 100644
--- a/frysk-core/frysk/testbed/SignalWaiter.java
+++ b/frysk-core/frysk/testbed/SignalWaiter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/SlaveOffspring.java b/frysk-core/frysk/testbed/SlaveOffspring.java
index 7c07fd6..c1833f4 100644
--- a/frysk-core/frysk/testbed/SlaveOffspring.java
+++ b/frysk-core/frysk/testbed/SlaveOffspring.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/StatState.java b/frysk-core/frysk/testbed/StatState.java
index adc5b22..afdc744 100644
--- a/frysk-core/frysk/testbed/StatState.java
+++ b/frysk-core/frysk/testbed/StatState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/StopEventLoopWhenProcTerminated.java b/frysk-core/frysk/testbed/StopEventLoopWhenProcTerminated.java
index 5b8737d..cfdc7b0 100644
--- a/frysk-core/frysk/testbed/StopEventLoopWhenProcTerminated.java
+++ b/frysk-core/frysk/testbed/StopEventLoopWhenProcTerminated.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/SynchronizedOffspring.java b/frysk-core/frysk/testbed/SynchronizedOffspring.java
index 655f23a..86e9a24 100644
--- a/frysk-core/frysk/testbed/SynchronizedOffspring.java
+++ b/frysk-core/frysk/testbed/SynchronizedOffspring.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TaskObserverBase.java b/frysk-core/frysk/testbed/TaskObserverBase.java
index bd4b7ad..1373f84 100644
--- a/frysk-core/frysk/testbed/TaskObserverBase.java
+++ b/frysk-core/frysk/testbed/TaskObserverBase.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TaskSet.java b/frysk-core/frysk/testbed/TaskSet.java
index 1255253..b835e36 100644
--- a/frysk-core/frysk/testbed/TaskSet.java
+++ b/frysk-core/frysk/testbed/TaskSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestCorefileFactory.java b/frysk-core/frysk/testbed/TestCorefileFactory.java
index 6fa0f1c..a17adcc 100644
--- a/frysk-core/frysk/testbed/TestCorefileFactory.java
+++ b/frysk-core/frysk/testbed/TestCorefileFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestDaemonBlockedAtSignal.java b/frysk-core/frysk/testbed/TestDaemonBlockedAtSignal.java
index 4f6aa84..250c05e 100644
--- a/frysk-core/frysk/testbed/TestDaemonBlockedAtSignal.java
+++ b/frysk-core/frysk/testbed/TestDaemonBlockedAtSignal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestFryskAsm.java b/frysk-core/frysk/testbed/TestFryskAsm.java
index 77f328b..d43d564 100644
--- a/frysk-core/frysk/testbed/TestFryskAsm.java
+++ b/frysk-core/frysk/testbed/TestFryskAsm.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestIsa.java b/frysk-core/frysk/testbed/TestIsa.java
index f5d9610..a5658e7 100644
--- a/frysk-core/frysk/testbed/TestIsa.java
+++ b/frysk-core/frysk/testbed/TestIsa.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestLib.java b/frysk-core/frysk/testbed/TestLib.java
index 7acf902..d6b8dc9 100644
--- a/frysk-core/frysk/testbed/TestLib.java
+++ b/frysk-core/frysk/testbed/TestLib.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestRegs.java b/frysk-core/frysk/testbed/TestRegs.java
index ae1308c..62e382a 100644
--- a/frysk-core/frysk/testbed/TestRegs.java
+++ b/frysk-core/frysk/testbed/TestRegs.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestSignalWaiter.java b/frysk-core/frysk/testbed/TestSignalWaiter.java
index cdf8d3b..af8b095 100644
--- a/frysk-core/frysk/testbed/TestSignalWaiter.java
+++ b/frysk-core/frysk/testbed/TestSignalWaiter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestStatState.java b/frysk-core/frysk/testbed/TestStatState.java
index 679e672..c2fa046 100644
--- a/frysk-core/frysk/testbed/TestStatState.java
+++ b/frysk-core/frysk/testbed/TestStatState.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestStopEventLoopWhenProcTerminates.java b/frysk-core/frysk/testbed/TestStopEventLoopWhenProcTerminates.java
index 0530370..d28d1cc 100644
--- a/frysk-core/frysk/testbed/TestStopEventLoopWhenProcTerminates.java
+++ b/frysk-core/frysk/testbed/TestStopEventLoopWhenProcTerminates.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/testbed/TestfileTokenScanner.java b/frysk-core/frysk/testbed/TestfileTokenScanner.java
index 9b52297..de07c80 100644
--- a/frysk-core/frysk/testbed/TestfileTokenScanner.java
+++ b/frysk-core/frysk/testbed/TestfileTokenScanner.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/ArchFormatter.java b/frysk-core/frysk/util/ArchFormatter.java
index 0abb340..0280b65 100644
--- a/frysk-core/frysk/util/ArchFormatter.java
+++ b/frysk-core/frysk/util/ArchFormatter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/AuxvStringBuilder.java b/frysk-core/frysk/util/AuxvStringBuilder.java
index 69d0ceb..cf1488b 100644
--- a/frysk-core/frysk/util/AuxvStringBuilder.java
+++ b/frysk-core/frysk/util/AuxvStringBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/CommandlineParser.java b/frysk-core/frysk/util/CommandlineParser.java
index e0c6a32..7bec2e8 100644
--- a/frysk-core/frysk/util/CommandlineParser.java
+++ b/frysk-core/frysk/util/CommandlineParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/CoreExePair.java b/frysk-core/frysk/util/CoreExePair.java
index 38de989..86be84c 100644
--- a/frysk-core/frysk/util/CoreExePair.java
+++ b/frysk-core/frysk/util/CoreExePair.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/CountDownLatch.java b/frysk-core/frysk/util/CountDownLatch.java
index f9d548f..cb859e6 100644
--- a/frysk-core/frysk/util/CountDownLatch.java
+++ b/frysk-core/frysk/util/CountDownLatch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/DebuginfoPaths.java b/frysk-core/frysk/util/DebuginfoPaths.java
index d38bc93..9bbeaab 100644
--- a/frysk-core/frysk/util/DebuginfoPaths.java
+++ b/frysk-core/frysk/util/DebuginfoPaths.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/FCatch.java b/frysk-core/frysk/util/FCatch.java
index 3157ed9..1e4caf2 100644
--- a/frysk-core/frysk/util/FCatch.java
+++ b/frysk-core/frysk/util/FCatch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/FlowControlWriter.java b/frysk-core/frysk/util/FlowControlWriter.java
index 0ab8dfb..fc1199b 100644
--- a/frysk-core/frysk/util/FlowControlWriter.java
+++ b/frysk-core/frysk/util/FlowControlWriter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/Glob.java b/frysk-core/frysk/util/Glob.java
index 0bb0632..3785344 100644
--- a/frysk-core/frysk/util/Glob.java
+++ b/frysk-core/frysk/util/Glob.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/ObservingTerminal.java b/frysk-core/frysk/util/ObservingTerminal.java
index 162be63..9cd7025 100644
--- a/frysk-core/frysk/util/ObservingTerminal.java
+++ b/frysk-core/frysk/util/ObservingTerminal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/ProcFollowUtil.java b/frysk-core/frysk/util/ProcFollowUtil.java
index b3df90c..39e374e 100644
--- a/frysk-core/frysk/util/ProcFollowUtil.java
+++ b/frysk-core/frysk/util/ProcFollowUtil.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/ProcRunUtil.java b/frysk-core/frysk/util/ProcRunUtil.java
index 4d30907..84f20c5 100644
--- a/frysk-core/frysk/util/ProcRunUtil.java
+++ b/frysk-core/frysk/util/ProcRunUtil.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/PtyTerminal.java b/frysk-core/frysk/util/PtyTerminal.java
index 23bb95a..517dd50 100644
--- a/frysk-core/frysk/util/PtyTerminal.java
+++ b/frysk-core/frysk/util/PtyTerminal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/StackPrintUtil.java b/frysk-core/frysk/util/StackPrintUtil.java
index ab7fc01..dd3b943 100644
--- a/frysk-core/frysk/util/StackPrintUtil.java
+++ b/frysk-core/frysk/util/StackPrintUtil.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/StacktraceAction.java b/frysk-core/frysk/util/StacktraceAction.java
index 9b83662..ef1a474 100644
--- a/frysk-core/frysk/util/StacktraceAction.java
+++ b/frysk-core/frysk/util/StacktraceAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/StressTestStackTraceAction.java b/frysk-core/frysk/util/StressTestStackTraceAction.java
index 75ccf5f..4ecb0b2 100644
--- a/frysk-core/frysk/util/StressTestStackTraceAction.java
+++ b/frysk-core/frysk/util/StressTestStackTraceAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/TaskStopUtil.java b/frysk-core/frysk/util/TaskStopUtil.java
index 16dbefc..a194a90 100644
--- a/frysk-core/frysk/util/TaskStopUtil.java
+++ b/frysk-core/frysk/util/TaskStopUtil.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/TestCommandlineParser.java b/frysk-core/frysk/util/TestCommandlineParser.java
index 10c9de1..d034685 100644
--- a/frysk-core/frysk/util/TestCommandlineParser.java
+++ b/frysk-core/frysk/util/TestCommandlineParser.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/TestCountDownLatch.java b/frysk-core/frysk/util/TestCountDownLatch.java
index 3535d02..f8a6afb 100644
--- a/frysk-core/frysk/util/TestCountDownLatch.java
+++ b/frysk-core/frysk/util/TestCountDownLatch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/TestGlob.java b/frysk-core/frysk/util/TestGlob.java
index 8efa4b8..3c3bdc9 100644
--- a/frysk-core/frysk/util/TestGlob.java
+++ b/frysk-core/frysk/util/TestGlob.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/TestStackTraceAction.java b/frysk-core/frysk/util/TestStackTraceAction.java
index 3fd33cf..e2f77c5 100644
--- a/frysk-core/frysk/util/TestStackTraceAction.java
+++ b/frysk-core/frysk/util/TestStackTraceAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/Util.java b/frysk-core/frysk/util/Util.java
index 562da9c..2177d4e 100644
--- a/frysk-core/frysk/util/Util.java
+++ b/frysk-core/frysk/util/Util.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/WordWrapWriter.java b/frysk-core/frysk/util/WordWrapWriter.java
index e8da436..5789a2a 100644
--- a/frysk-core/frysk/util/WordWrapWriter.java
+++ b/frysk-core/frysk/util/WordWrapWriter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/stack-options.xml b/frysk-core/frysk/util/stack-options.xml
index 5555d01..ad14f51 100644
--- a/frysk-core/frysk/util/stack-options.xml
+++ b/frysk-core/frysk/util/stack-options.xml
@@ -14,8 +14,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/util/standard-options.xml b/frysk-core/frysk/util/standard-options.xml
index 915a3b5..66764ad 100644
--- a/frysk-core/frysk/util/standard-options.xml
+++ b/frysk-core/frysk/util/standard-options.xml
@@ -14,8 +14,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/AddressUnit.java b/frysk-core/frysk/value/AddressUnit.java
index 094b589..c714a3b 100644
--- a/frysk-core/frysk/value/AddressUnit.java
+++ b/frysk-core/frysk/value/AddressUnit.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ArithmeticType.java b/frysk-core/frysk/value/ArithmeticType.java
index 2ab8722..8f60d2a 100644
--- a/frysk-core/frysk/value/ArithmeticType.java
+++ b/frysk-core/frysk/value/ArithmeticType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ArithmeticUnit.java b/frysk-core/frysk/value/ArithmeticUnit.java
index b3ec914..0a094fb 100644
--- a/frysk-core/frysk/value/ArithmeticUnit.java
+++ b/frysk-core/frysk/value/ArithmeticUnit.java
@@ -12,8 +12,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ArrayType.java b/frysk-core/frysk/value/ArrayType.java
index 6865556..4fe9b60 100644
--- a/frysk-core/frysk/value/ArrayType.java
+++ b/frysk-core/frysk/value/ArrayType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/BigFloatingPoint.java b/frysk-core/frysk/value/BigFloatingPoint.java
index b7bc169..0f8610d 100644
--- a/frysk-core/frysk/value/BigFloatingPoint.java
+++ b/frysk-core/frysk/value/BigFloatingPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/BooleanType.java b/frysk-core/frysk/value/BooleanType.java
index 4db5245..053079e 100644
--- a/frysk-core/frysk/value/BooleanType.java
+++ b/frysk-core/frysk/value/BooleanType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/BreakPointLocation.java b/frysk-core/frysk/value/BreakPointLocation.java
index 9ce3b21..db213d3 100644
--- a/frysk-core/frysk/value/BreakPointLocation.java
+++ b/frysk-core/frysk/value/BreakPointLocation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ByteBufferLocation.java b/frysk-core/frysk/value/ByteBufferLocation.java
index 915cad9..0492dca 100644
--- a/frysk-core/frysk/value/ByteBufferLocation.java
+++ b/frysk-core/frysk/value/ByteBufferLocation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/CharType.java b/frysk-core/frysk/value/CharType.java
index 852ccef..8e96079 100644
--- a/frysk-core/frysk/value/CharType.java
+++ b/frysk-core/frysk/value/CharType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ClassType.java b/frysk-core/frysk/value/ClassType.java
index 69c009f..9142362 100644
--- a/frysk-core/frysk/value/ClassType.java
+++ b/frysk-core/frysk/value/ClassType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/CompositeType.java b/frysk-core/frysk/value/CompositeType.java
index 846bd16..bd9832c 100644
--- a/frysk-core/frysk/value/CompositeType.java
+++ b/frysk-core/frysk/value/CompositeType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ConstType.java b/frysk-core/frysk/value/ConstType.java
index d08638f..a108632 100644
--- a/frysk-core/frysk/value/ConstType.java
+++ b/frysk-core/frysk/value/ConstType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/Constant.java b/frysk-core/frysk/value/Constant.java
index 0a1a823..31d519c 100644
--- a/frysk-core/frysk/value/Constant.java
+++ b/frysk-core/frysk/value/Constant.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/EnumType.java b/frysk-core/frysk/value/EnumType.java
index 0763c33..5564d0b 100644
--- a/frysk-core/frysk/value/EnumType.java
+++ b/frysk-core/frysk/value/EnumType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/FloatingPoint854Format.java b/frysk-core/frysk/value/FloatingPoint854Format.java
index eb3c108..1c6ea7a 100644
--- a/frysk-core/frysk/value/FloatingPoint854Format.java
+++ b/frysk-core/frysk/value/FloatingPoint854Format.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/FloatingPointFormat.java b/frysk-core/frysk/value/FloatingPointFormat.java
index 28fe0b0..eb051f1 100644
--- a/frysk-core/frysk/value/FloatingPointFormat.java
+++ b/frysk-core/frysk/value/FloatingPointFormat.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/FloatingPointType.java b/frysk-core/frysk/value/FloatingPointType.java
index 0f2f120..9bb4443 100644
--- a/frysk-core/frysk/value/FloatingPointType.java
+++ b/frysk-core/frysk/value/FloatingPointType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/FloatingPointUnit.java b/frysk-core/frysk/value/FloatingPointUnit.java
index 3d6f999..b2ca674 100644
--- a/frysk-core/frysk/value/FloatingPointUnit.java
+++ b/frysk-core/frysk/value/FloatingPointUnit.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/Format.java b/frysk-core/frysk/value/Format.java
index 1023fd8..a172057 100644
--- a/frysk-core/frysk/value/Format.java
+++ b/frysk-core/frysk/value/Format.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/FunctionType.java b/frysk-core/frysk/value/FunctionType.java
index 380c173..6f2bb6a 100644
--- a/frysk-core/frysk/value/FunctionType.java
+++ b/frysk-core/frysk/value/FunctionType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/GccStructOrClassType.java b/frysk-core/frysk/value/GccStructOrClassType.java
index 4940b2b..4b84d24 100644
--- a/frysk-core/frysk/value/GccStructOrClassType.java
+++ b/frysk-core/frysk/value/GccStructOrClassType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/IntegerType.java b/frysk-core/frysk/value/IntegerType.java
index 8724be3..7f0b605 100644
--- a/frysk-core/frysk/value/IntegerType.java
+++ b/frysk-core/frysk/value/IntegerType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/IntegerTypeDecorator.java b/frysk-core/frysk/value/IntegerTypeDecorator.java
index 8d1f73c..13d2082 100644
--- a/frysk-core/frysk/value/IntegerTypeDecorator.java
+++ b/frysk-core/frysk/value/IntegerTypeDecorator.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/IntegerUnit.java b/frysk-core/frysk/value/IntegerUnit.java
index 66bea73..5103d47 100644
--- a/frysk-core/frysk/value/IntegerUnit.java
+++ b/frysk-core/frysk/value/IntegerUnit.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/InterfaceType.java b/frysk-core/frysk/value/InterfaceType.java
index 3c575a0..6a0121e 100644
--- a/frysk-core/frysk/value/InterfaceType.java
+++ b/frysk-core/frysk/value/InterfaceType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/InvalidOperatorException.java b/frysk-core/frysk/value/InvalidOperatorException.java
index 4b704ba..1a8ea9d 100644
--- a/frysk-core/frysk/value/InvalidOperatorException.java
+++ b/frysk-core/frysk/value/InvalidOperatorException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/Location.java b/frysk-core/frysk/value/Location.java
index 27b52a0..7a9dfec 100644
--- a/frysk-core/frysk/value/Location.java
+++ b/frysk-core/frysk/value/Location.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ObjectDeclaration.java b/frysk-core/frysk/value/ObjectDeclaration.java
index 7906f8d..1f8efde 100644
--- a/frysk-core/frysk/value/ObjectDeclaration.java
+++ b/frysk-core/frysk/value/ObjectDeclaration.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/OperationNotDefinedException.java b/frysk-core/frysk/value/OperationNotDefinedException.java
index edacb99..0ae1faa 100644
--- a/frysk-core/frysk/value/OperationNotDefinedException.java
+++ b/frysk-core/frysk/value/OperationNotDefinedException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/PackedType.java b/frysk-core/frysk/value/PackedType.java
index a7d2100..fe14f34 100644
--- a/frysk-core/frysk/value/PackedType.java
+++ b/frysk-core/frysk/value/PackedType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/Packing.java b/frysk-core/frysk/value/Packing.java
index f916d0d..30ef63a 100644
--- a/frysk-core/frysk/value/Packing.java
+++ b/frysk-core/frysk/value/Packing.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/PointerType.java b/frysk-core/frysk/value/PointerType.java
index bbf507a..9c3236e 100644
--- a/frysk-core/frysk/value/PointerType.java
+++ b/frysk-core/frysk/value/PointerType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ReferenceType.java b/frysk-core/frysk/value/ReferenceType.java
index 01f9cc0..90d0713 100644
--- a/frysk-core/frysk/value/ReferenceType.java
+++ b/frysk-core/frysk/value/ReferenceType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/RestrictType.java b/frysk-core/frysk/value/RestrictType.java
index 6750fc0..02e1618 100644
--- a/frysk-core/frysk/value/RestrictType.java
+++ b/frysk-core/frysk/value/RestrictType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/ScratchLocation.java b/frysk-core/frysk/value/ScratchLocation.java
index e332946..932115a 100644
--- a/frysk-core/frysk/value/ScratchLocation.java
+++ b/frysk-core/frysk/value/ScratchLocation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/SharedType.java b/frysk-core/frysk/value/SharedType.java
index accdad5..9bf6c5c 100644
--- a/frysk-core/frysk/value/SharedType.java
+++ b/frysk-core/frysk/value/SharedType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/SignedType.java b/frysk-core/frysk/value/SignedType.java
index 8500485..246ef2d 100644
--- a/frysk-core/frysk/value/SignedType.java
+++ b/frysk-core/frysk/value/SignedType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/StandardTypes.java b/frysk-core/frysk/value/StandardTypes.java
index 0ce6a52..9318548 100644
--- a/frysk-core/frysk/value/StandardTypes.java
+++ b/frysk-core/frysk/value/StandardTypes.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/StructType.java b/frysk-core/frysk/value/StructType.java
index 393514d..904492f 100644
--- a/frysk-core/frysk/value/StructType.java
+++ b/frysk-core/frysk/value/StructType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestArray.java b/frysk-core/frysk/value/TestArray.java
index a715b72..f9ee26a 100644
--- a/frysk-core/frysk/value/TestArray.java
+++ b/frysk-core/frysk/value/TestArray.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestComposite.java b/frysk-core/frysk/value/TestComposite.java
index 59dc86e..848ac20 100644
--- a/frysk-core/frysk/value/TestComposite.java
+++ b/frysk-core/frysk/value/TestComposite.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestDecoratorTypes.java b/frysk-core/frysk/value/TestDecoratorTypes.java
index 8751039..1e239cd 100644
--- a/frysk-core/frysk/value/TestDecoratorTypes.java
+++ b/frysk-core/frysk/value/TestDecoratorTypes.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestEnum.java b/frysk-core/frysk/value/TestEnum.java
index f3353f9..b409ac5 100644
--- a/frysk-core/frysk/value/TestEnum.java
+++ b/frysk-core/frysk/value/TestEnum.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestFloatingPoint.java b/frysk-core/frysk/value/TestFloatingPoint.java
index 5bee28c..8c2b734 100644
--- a/frysk-core/frysk/value/TestFloatingPoint.java
+++ b/frysk-core/frysk/value/TestFloatingPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestFloatingPoint854Format.java b/frysk-core/frysk/value/TestFloatingPoint854Format.java
index 508bb7b..c80e8d1 100644
--- a/frysk-core/frysk/value/TestFloatingPoint854Format.java
+++ b/frysk-core/frysk/value/TestFloatingPoint854Format.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestFormat.java b/frysk-core/frysk/value/TestFormat.java
index 07d434a..8f153d6 100644
--- a/frysk-core/frysk/value/TestFormat.java
+++ b/frysk-core/frysk/value/TestFormat.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestIntegerType.java b/frysk-core/frysk/value/TestIntegerType.java
index 6db4210..4a9c33b 100644
--- a/frysk-core/frysk/value/TestIntegerType.java
+++ b/frysk-core/frysk/value/TestIntegerType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestLocation.java b/frysk-core/frysk/value/TestLocation.java
index 9a192df..03f476f 100644
--- a/frysk-core/frysk/value/TestLocation.java
+++ b/frysk-core/frysk/value/TestLocation.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestPacking.java b/frysk-core/frysk/value/TestPacking.java
index aa09e95..bfa0be5 100644
--- a/frysk-core/frysk/value/TestPacking.java
+++ b/frysk-core/frysk/value/TestPacking.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestPointer.java b/frysk-core/frysk/value/TestPointer.java
index df93465..37abe09 100644
--- a/frysk-core/frysk/value/TestPointer.java
+++ b/frysk-core/frysk/value/TestPointer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TestValue.java b/frysk-core/frysk/value/TestValue.java
index 7ee22b2..7de63aa 100644
--- a/frysk-core/frysk/value/TestValue.java
+++ b/frysk-core/frysk/value/TestValue.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/Type.java b/frysk-core/frysk/value/Type.java
index 5ff9812..fe00863 100644
--- a/frysk-core/frysk/value/Type.java
+++ b/frysk-core/frysk/value/Type.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TypeDecorator.java b/frysk-core/frysk/value/TypeDecorator.java
index 176ee2a..85e647a 100644
--- a/frysk-core/frysk/value/TypeDecorator.java
+++ b/frysk-core/frysk/value/TypeDecorator.java
@@ -12,8 +12,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/TypeDef.java b/frysk-core/frysk/value/TypeDef.java
index 65d3cf7..fd0323d 100644
--- a/frysk-core/frysk/value/TypeDef.java
+++ b/frysk-core/frysk/value/TypeDef.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/UnionType.java b/frysk-core/frysk/value/UnionType.java
index de9413c..edf2ea9 100644
--- a/frysk-core/frysk/value/UnionType.java
+++ b/frysk-core/frysk/value/UnionType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/UnknownType.java b/frysk-core/frysk/value/UnknownType.java
index 9d1122a..32da573 100644
--- a/frysk-core/frysk/value/UnknownType.java
+++ b/frysk-core/frysk/value/UnknownType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/UnsignedType.java b/frysk-core/frysk/value/UnsignedType.java
index 74e19ab..ce4e954 100644
--- a/frysk-core/frysk/value/UnsignedType.java
+++ b/frysk-core/frysk/value/UnsignedType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/Value.java b/frysk-core/frysk/value/Value.java
index e7f4db8..9ee6b7c 100644
--- a/frysk-core/frysk/value/Value.java
+++ b/frysk-core/frysk/value/Value.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/VoidType.java b/frysk-core/frysk/value/VoidType.java
index b73073c..b05f89b 100644
--- a/frysk-core/frysk/value/VoidType.java
+++ b/frysk-core/frysk/value/VoidType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/frysk/value/VolatileType.java b/frysk-core/frysk/value/VolatileType.java
index 356f23c..2716226 100644
--- a/frysk-core/frysk/value/VolatileType.java
+++ b/frysk-core/frysk/value/VolatileType.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/kill/detach.c b/frysk-core/prog/kill/detach.c
index 2eb7afd..78f7591 100644
--- a/frysk-core/prog/kill/detach.c
+++ b/frysk-core/prog/kill/detach.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/kill/loop.c b/frysk-core/prog/kill/loop.c
index af4f6e0..17b7c5b 100644
--- a/frysk-core/prog/kill/loop.c
+++ b/frysk-core/prog/kill/loop.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/kill/suspend.c b/frysk-core/prog/kill/suspend.c
index 5a2e668..3f498f2 100644
--- a/frysk-core/prog/kill/suspend.c
+++ b/frysk-core/prog/kill/suspend.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/perf/clone.c b/frysk-core/prog/perf/clone.c
index 7a726c4..7d371ed 100644
--- a/frysk-core/prog/perf/clone.c
+++ b/frysk-core/prog/perf/clone.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/perf/clone.sh b/frysk-core/prog/perf/clone.sh
index da9af97..8a19040 100755
--- a/frysk-core/prog/perf/clone.sh
+++ b/frysk-core/prog/perf/clone.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/perf/fork.c b/frysk-core/prog/perf/fork.c
index f5a4960..0136006 100644
--- a/frysk-core/prog/perf/fork.c
+++ b/frysk-core/prog/perf/fork.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/step/infThreadLoop.c b/frysk-core/prog/step/infThreadLoop.c
index 983b9c5..3864db9 100644
--- a/frysk-core/prog/step/infThreadLoop.c
+++ b/frysk-core/prog/step/infThreadLoop.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-core/prog/terminated/infloop.c b/frysk-core/prog/terminated/infloop.c
index 0a25c7d..b8ffc20 100644
--- a/frysk-core/prog/terminated/infloop.c
+++ b/frysk-core/prog/terminated/infloop.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/Makefile.am b/frysk-gtk/Makefile.am
index b7ade5f..ea8b0aa 100644
--- a/frysk-gtk/Makefile.am
+++ b/frysk-gtk/Makefile.am
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/bootstrap.sh b/frysk-gtk/bootstrap.sh
index 18da4d6..dc12a72 100755
--- a/frysk-gtk/bootstrap.sh
+++ b/frysk-gtk/bootstrap.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/configure.ac b/frysk-gtk/configure.ac
index 43f38eb..aaa123f 100644
--- a/frysk-gtk/configure.ac
+++ b/frysk-gtk/configure.ac
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/org/gnu/gtk/frysk/EggTrayIcon.java b/frysk-gtk/org/gnu/gtk/frysk/EggTrayIcon.java
index 0573d2a..925f508 100644
--- a/frysk-gtk/org/gnu/gtk/frysk/EggTrayIcon.java
+++ b/frysk-gtk/org/gnu/gtk/frysk/EggTrayIcon.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/tests/Makefile.am b/frysk-gtk/tests/Makefile.am
index 713ebc1..f01b901 100644
--- a/frysk-gtk/tests/Makefile.am
+++ b/frysk-gtk/tests/Makefile.am
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/tests/frysk2333/TestGlibTimerGC.java b/frysk-gtk/tests/frysk2333/TestGlibTimerGC.java
index 0e9c1d3..0931f42 100644
--- a/frysk-gtk/tests/frysk2333/TestGlibTimerGC.java
+++ b/frysk-gtk/tests/frysk2333/TestGlibTimerGC.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/tests/frysk3116/RegionAndGCFailure.java b/frysk-gtk/tests/frysk3116/RegionAndGCFailure.java
index 010f9eb..9eaabd8 100644
--- a/frysk-gtk/tests/frysk3116/RegionAndGCFailure.java
+++ b/frysk-gtk/tests/frysk3116/RegionAndGCFailure.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/tlwidgets/Makefile.am b/frysk-gtk/tlwidgets/Makefile.am
index 4f27182..dc96720 100644
--- a/frysk-gtk/tlwidgets/Makefile.am
+++ b/frysk-gtk/tlwidgets/Makefile.am
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.c b/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.c
index cdf11fb..6277d64 100644
--- a/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.c
+++ b/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.c
@@ -11,7 +11,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with Red Hat CustomDrawingArea; if not, write to the Free Software Foundation,
+   with Red Hat CustomDrawingArea.  If not, see <http://www.gnu.org/licenses/>.
    Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. */
 
 #define _GNU_SOURCE
diff --git a/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.h b/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.h
index 20dd174..47520cc 100644
--- a/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.h
+++ b/frysk-gtk/tlwidgets/src/widgets/ftkcustomdrawingarea.h
@@ -11,7 +11,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with Red Hat Customdrawingarea; if not, write to the Free Software Foundation,
+   with Red Hat Customdrawingarea.  If not, see <http://www.gnu.org/licenses/>.
    Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. */
 
 #ifndef __FTK_CUSTOMDRAWINGAREA_H__
diff --git a/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.c b/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.c
index 1b6348a..3ce8040 100644
--- a/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.c
+++ b/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.c
@@ -11,7 +11,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with Red Hat EventViewer; if not, write to the Free Software Foundation,
+   with Red Hat EventViewer.  If not, see <http://www.gnu.org/licenses/>.
    Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. */
 
 #define _GNU_SOURCE
diff --git a/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.h b/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.h
index 827baa6..9500075 100644
--- a/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.h
+++ b/frysk-gtk/tlwidgets/src/widgets/ftkeventviewer.h
@@ -11,7 +11,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with Red Hat EventViewer; if not, write to the Free Software Foundation,
+   with Red Hat EventViewer.  If not, see <http://www.gnu.org/licenses/>.
    Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. */
 
 #ifndef __FTK_EVENTVIEWER_H__
diff --git a/frysk-gui/Makefile.am b/frysk-gui/Makefile.am
index 7594786..92bdb4c 100644
--- a/frysk-gui/Makefile.am
+++ b/frysk-gui/Makefile.am
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/bootstrap.sh b/frysk-gui/bootstrap.sh
index 81a8ef7..cbffd00 100755
--- a/frysk-gui/bootstrap.sh
+++ b/frysk-gui/bootstrap.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/configure.ac b/frysk-gui/configure.ac
index ba48e36..9a274c6 100644
--- a/frysk-gui/configure.ac
+++ b/frysk-gui/configure.ac
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/EventLogger.java b/frysk-gui/frysk/EventLogger.java
index dbf8f15..54b8f46 100644
--- a/frysk-gui/frysk/EventLogger.java
+++ b/frysk-gui/frysk/EventLogger.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/bindir/frysk.java b/frysk-gui/frysk/bindir/frysk.java
index 8e8e806..e89c0eb 100644
--- a/frysk-gui/frysk/bindir/frysk.java
+++ b/frysk-gui/frysk/bindir/frysk.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/bindir/frysk.xml-in b/frysk-gui/frysk/bindir/frysk.xml-in
index 9e298a0..9523c3a 100644
--- a/frysk-gui/frysk/bindir/frysk.xml-in
+++ b/frysk-gui/frysk/bindir/frysk.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/DebugHistory.java b/frysk-gui/frysk/gui/DebugHistory.java
index 5f75a58..ccc7b96 100644
--- a/frysk-gui/frysk/gui/DebugHistory.java
+++ b/frysk-gui/frysk/gui/DebugHistory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/FryskGui.java-in b/frysk-gui/frysk/gui/FryskGui.java-in
index 61ccea8..be5640d 100644
--- a/frysk-gui/frysk/gui/FryskGui.java-in
+++ b/frysk-gui/frysk/gui/FryskGui.java-in
@@ -14,8 +14,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/FryskHelpManager.java b/frysk-gui/frysk/gui/FryskHelpManager.java
index 9fc4a29..4136280 100644
--- a/frysk-gui/frysk/gui/FryskHelpManager.java
+++ b/frysk-gui/frysk/gui/FryskHelpManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/Gui.java b/frysk-gui/frysk/gui/Gui.java
index 2b0c4dc..611f87f 100644
--- a/frysk-gui/frysk/gui/Gui.java
+++ b/frysk-gui/frysk/gui/Gui.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/SessionManagerDialog.java b/frysk-gui/frysk/gui/SessionManagerDialog.java
index cc2bb95..b7ec035 100644
--- a/frysk-gui/frysk/gui/SessionManagerDialog.java
+++ b/frysk-gui/frysk/gui/SessionManagerDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/TestGlade.java b/frysk-gui/frysk/gui/TestGlade.java
index 1efa289..d21298f 100644
--- a/frysk-gui/frysk/gui/TestGlade.java
+++ b/frysk-gui/frysk/gui/TestGlade.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/common/FryskIconSet.java b/frysk-gui/frysk/gui/common/FryskIconSet.java
index 7a81419..fc52c3e 100644
--- a/frysk-gui/frysk/gui/common/FryskIconSet.java
+++ b/frysk-gui/frysk/gui/common/FryskIconSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/common/IconManager.java b/frysk-gui/frysk/gui/common/IconManager.java
index e5702ec..75ad5dc 100644
--- a/frysk-gui/frysk/gui/common/IconManager.java
+++ b/frysk-gui/frysk/gui/common/IconManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/common/Messages.java b/frysk-gui/frysk/gui/common/Messages.java
index 9e9017f..f46b510 100644
--- a/frysk-gui/frysk/gui/common/Messages.java
+++ b/frysk-gui/frysk/gui/common/Messages.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/common/UBigInteger.java b/frysk-gui/frysk/gui/common/UBigInteger.java
index 160cb6e..28f1d03 100644
--- a/frysk-gui/frysk/gui/common/UBigInteger.java
+++ b/frysk-gui/frysk/gui/common/UBigInteger.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/common/Util.java b/frysk-gui/frysk/gui/common/Util.java
index 95f66aa..5f8c97c 100644
--- a/frysk-gui/frysk/gui/common/Util.java
+++ b/frysk-gui/frysk/gui/common/Util.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/console/ConsoleWindow.java b/frysk-gui/frysk/gui/console/ConsoleWindow.java
index 5708849..9e6492d 100644
--- a/frysk-gui/frysk/gui/console/ConsoleWindow.java
+++ b/frysk-gui/frysk/gui/console/ConsoleWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/Dialog.java b/frysk-gui/frysk/gui/dialogs/Dialog.java
index f0b93f3..171f721 100644
--- a/frysk-gui/frysk/gui/dialogs/Dialog.java
+++ b/frysk-gui/frysk/gui/dialogs/Dialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/DialogManager.java b/frysk-gui/frysk/gui/dialogs/DialogManager.java
index e2d6515..dc8a321 100644
--- a/frysk-gui/frysk/gui/dialogs/DialogManager.java
+++ b/frysk-gui/frysk/gui/dialogs/DialogManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/ErrorDialog.java b/frysk-gui/frysk/gui/dialogs/ErrorDialog.java
index ab27da9..7fb5313 100644
--- a/frysk-gui/frysk/gui/dialogs/ErrorDialog.java
+++ b/frysk-gui/frysk/gui/dialogs/ErrorDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/FryskDialog.java b/frysk-gui/frysk/gui/dialogs/FryskDialog.java
index a4803f7..bc12d37 100644
--- a/frysk-gui/frysk/gui/dialogs/FryskDialog.java
+++ b/frysk-gui/frysk/gui/dialogs/FryskDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/NoDebugInfoDialog.java b/frysk-gui/frysk/gui/dialogs/NoDebugInfoDialog.java
index b7e6050..be12884 100644
--- a/frysk-gui/frysk/gui/dialogs/NoDebugInfoDialog.java
+++ b/frysk-gui/frysk/gui/dialogs/NoDebugInfoDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/QueryDialog.java b/frysk-gui/frysk/gui/dialogs/QueryDialog.java
index 7091709..10309bc 100644
--- a/frysk-gui/frysk/gui/dialogs/QueryDialog.java
+++ b/frysk-gui/frysk/gui/dialogs/QueryDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/dialogs/WarnDialog.java b/frysk-gui/frysk/gui/dialogs/WarnDialog.java
index 4d16e77..da6121b 100644
--- a/frysk-gui/frysk/gui/dialogs/WarnDialog.java
+++ b/frysk-gui/frysk/gui/dialogs/WarnDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/disassembler/DisassemblyFormatDialog.java b/frysk-gui/frysk/gui/disassembler/DisassemblyFormatDialog.java
index 33f9b2a..c036028 100644
--- a/frysk-gui/frysk/gui/disassembler/DisassemblyFormatDialog.java
+++ b/frysk-gui/frysk/gui/disassembler/DisassemblyFormatDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/disassembler/DisassemblyWindow.java b/frysk-gui/frysk/gui/disassembler/DisassemblyWindow.java
index 0f13e94..f36b554 100644
--- a/frysk-gui/frysk/gui/disassembler/DisassemblyWindow.java
+++ b/frysk-gui/frysk/gui/disassembler/DisassemblyWindow.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/disassembler/DisassemblyWindowFactory.java b/frysk-gui/frysk/gui/disassembler/DisassemblyWindowFactory.java
index c6ad64c..a049062 100644
--- a/frysk-gui/frysk/gui/disassembler/DisassemblyWindowFactory.java
+++ b/frysk-gui/frysk/gui/disassembler/DisassemblyWindowFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/druid/CreateFryskSessionDruid.java b/frysk-gui/frysk/gui/druid/CreateFryskSessionDruid.java
index a30b6eb..81834fa 100644
--- a/frysk-gui/frysk/gui/druid/CreateFryskSessionDruid.java
+++ b/frysk-gui/frysk/gui/druid/CreateFryskSessionDruid.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/memory/MemoryFormatDialog.java b/frysk-gui/frysk/gui/memory/MemoryFormatDialog.java
index 8be22b2..0ac8932 100644
--- a/frysk-gui/frysk/gui/memory/MemoryFormatDialog.java
+++ b/frysk-gui/frysk/gui/memory/MemoryFormatDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/memory/MemoryWindow.java b/frysk-gui/frysk/gui/memory/MemoryWindow.java
index 4f40806..cff6268 100644
--- a/frysk-gui/frysk/gui/memory/MemoryWindow.java
+++ b/frysk-gui/frysk/gui/memory/MemoryWindow.java
@@ -13,8 +13,7 @@
 //General Public License for more details.
 //
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/memory/MemoryWindowFactory.java b/frysk-gui/frysk/gui/memory/MemoryWindowFactory.java
index 496dfd2..b8e115a 100644
--- a/frysk-gui/frysk/gui/memory/MemoryWindowFactory.java
+++ b/frysk-gui/frysk/gui/memory/MemoryWindowFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/AboutWindow.java b/frysk-gui/frysk/gui/monitor/AboutWindow.java
index fd6cef2..9a4752c 100644
--- a/frysk-gui/frysk/gui/monitor/AboutWindow.java
+++ b/frysk-gui/frysk/gui/monitor/AboutWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ActionPool.java b/frysk-gui/frysk/gui/monitor/ActionPool.java
index a6019b3..76c6746 100644
--- a/frysk-gui/frysk/gui/monitor/ActionPool.java
+++ b/frysk-gui/frysk/gui/monitor/ActionPool.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ActionRow.java b/frysk-gui/frysk/gui/monitor/ActionRow.java
index 0cae42f..210e6b2 100644
--- a/frysk-gui/frysk/gui/monitor/ActionRow.java
+++ b/frysk-gui/frysk/gui/monitor/ActionRow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ActionsTable.java b/frysk-gui/frysk/gui/monitor/ActionsTable.java
index 8500f62..fe77411 100644
--- a/frysk-gui/frysk/gui/monitor/ActionsTable.java
+++ b/frysk-gui/frysk/gui/monitor/ActionsTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ActionsWidget.java b/frysk-gui/frysk/gui/monitor/ActionsWidget.java
index 420412a..d16ab8e 100644
--- a/frysk-gui/frysk/gui/monitor/ActionsWidget.java
+++ b/frysk-gui/frysk/gui/monitor/ActionsWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/CheckedListView.java b/frysk-gui/frysk/gui/monitor/CheckedListView.java
index 29ab55c..98a4b9f 100644
--- a/frysk-gui/frysk/gui/monitor/CheckedListView.java
+++ b/frysk-gui/frysk/gui/monitor/CheckedListView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/Combo.java b/frysk-gui/frysk/gui/monitor/Combo.java
index 3b6b0b0..86f00ae 100644
--- a/frysk-gui/frysk/gui/monitor/Combo.java
+++ b/frysk-gui/frysk/gui/monitor/Combo.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/CompletingEntry.java b/frysk-gui/frysk/gui/monitor/CompletingEntry.java
index 37cb3f6..40b3774 100644
--- a/frysk-gui/frysk/gui/monitor/CompletingEntry.java
+++ b/frysk-gui/frysk/gui/monitor/CompletingEntry.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ConsoleWidget.java b/frysk-gui/frysk/gui/monitor/ConsoleWidget.java
index 30ab1a2..6127656 100644
--- a/frysk-gui/frysk/gui/monitor/ConsoleWidget.java
+++ b/frysk-gui/frysk/gui/monitor/ConsoleWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ConsoleWindow.java b/frysk-gui/frysk/gui/monitor/ConsoleWindow.java
index 3414397..3c30ef0 100644
--- a/frysk-gui/frysk/gui/monitor/ConsoleWindow.java
+++ b/frysk-gui/frysk/gui/monitor/ConsoleWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/CoreDebugLogViewer.java b/frysk-gui/frysk/gui/monitor/CoreDebugLogViewer.java
index 479ddbc..c4c9db3 100644
--- a/frysk-gui/frysk/gui/monitor/CoreDebugLogViewer.java
+++ b/frysk-gui/frysk/gui/monitor/CoreDebugLogViewer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/DetailedObserverTreeView.java b/frysk-gui/frysk/gui/monitor/DetailedObserverTreeView.java
index 8ad93db..d6bd0ac 100644
--- a/frysk-gui/frysk/gui/monitor/DetailedObserverTreeView.java
+++ b/frysk-gui/frysk/gui/monitor/DetailedObserverTreeView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/DynamicWidget.java b/frysk-gui/frysk/gui/monitor/DynamicWidget.java
index 7e58926..dd3e1a4 100644
--- a/frysk-gui/frysk/gui/monitor/DynamicWidget.java
+++ b/frysk-gui/frysk/gui/monitor/DynamicWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/EditObserverDialog.java b/frysk-gui/frysk/gui/monitor/EditObserverDialog.java
index 40fe9a9..8b27114 100644
--- a/frysk-gui/frysk/gui/monitor/EditObserverDialog.java
+++ b/frysk-gui/frysk/gui/monitor/EditObserverDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/EventFormatter.java b/frysk-gui/frysk/gui/monitor/EventFormatter.java
index ab13721..317acee 100644
--- a/frysk-gui/frysk/gui/monitor/EventFormatter.java
+++ b/frysk-gui/frysk/gui/monitor/EventFormatter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/EventLogger.java b/frysk-gui/frysk/gui/monitor/EventLogger.java
index 8ca09cb..9051def 100644
--- a/frysk-gui/frysk/gui/monitor/EventLogger.java
+++ b/frysk-gui/frysk/gui/monitor/EventLogger.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/FilterRow.java b/frysk-gui/frysk/gui/monitor/FilterRow.java
index 94ac475..ef526b0 100644
--- a/frysk-gui/frysk/gui/monitor/FilterRow.java
+++ b/frysk-gui/frysk/gui/monitor/FilterRow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/FiltersTable.java b/frysk-gui/frysk/gui/monitor/FiltersTable.java
index 3d434f1..416961f 100644
--- a/frysk-gui/frysk/gui/monitor/FiltersTable.java
+++ b/frysk-gui/frysk/gui/monitor/FiltersTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/FryskErrorFileHandler.java b/frysk-gui/frysk/gui/monitor/FryskErrorFileHandler.java
index 856bee6..8053124 100644
--- a/frysk-gui/frysk/gui/monitor/FryskErrorFileHandler.java
+++ b/frysk-gui/frysk/gui/monitor/FryskErrorFileHandler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/GuiCoreObjectWrapper.java b/frysk-gui/frysk/gui/monitor/GuiCoreObjectWrapper.java
index 6b7c786..71ba5a7 100644
--- a/frysk-gui/frysk/gui/monitor/GuiCoreObjectWrapper.java
+++ b/frysk-gui/frysk/gui/monitor/GuiCoreObjectWrapper.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/GuiObject.java b/frysk-gui/frysk/gui/monitor/GuiObject.java
index a6c6f1f..1421817 100644
--- a/frysk-gui/frysk/gui/monitor/GuiObject.java
+++ b/frysk-gui/frysk/gui/monitor/GuiObject.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/GuiObservable.java b/frysk-gui/frysk/gui/monitor/GuiObservable.java
index 44417ec..0d72e8a 100644
--- a/frysk-gui/frysk/gui/monitor/GuiObservable.java
+++ b/frysk-gui/frysk/gui/monitor/GuiObservable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/GuiProc.java b/frysk-gui/frysk/gui/monitor/GuiProc.java
index 6c54c2a..e1f61fd 100644
--- a/frysk-gui/frysk/gui/monitor/GuiProc.java
+++ b/frysk-gui/frysk/gui/monitor/GuiProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/GuiTask.java b/frysk-gui/frysk/gui/monitor/GuiTask.java
index 9d04533..3b463f1 100644
--- a/frysk-gui/frysk/gui/monitor/GuiTask.java
+++ b/frysk-gui/frysk/gui/monitor/GuiTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/LiaisonItem.java b/frysk-gui/frysk/gui/monitor/LiaisonItem.java
index d8827c5..a5bc643 100644
--- a/frysk-gui/frysk/gui/monitor/LiaisonItem.java
+++ b/frysk-gui/frysk/gui/monitor/LiaisonItem.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/LiaisonPoint.java b/frysk-gui/frysk/gui/monitor/LiaisonPoint.java
index fd6304c..0a6d410 100644
--- a/frysk-gui/frysk/gui/monitor/LiaisonPoint.java
+++ b/frysk-gui/frysk/gui/monitor/LiaisonPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ListView.java b/frysk-gui/frysk/gui/monitor/ListView.java
index d53ec8d..11aecc6 100644
--- a/frysk-gui/frysk/gui/monitor/ListView.java
+++ b/frysk-gui/frysk/gui/monitor/ListView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/LogWidget.java b/frysk-gui/frysk/gui/monitor/LogWidget.java
index b879dac..b6a6869 100644
--- a/frysk-gui/frysk/gui/monitor/LogWidget.java
+++ b/frysk-gui/frysk/gui/monitor/LogWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/MainWindow.java b/frysk-gui/frysk/gui/monitor/MainWindow.java
index b29521a..95d6d25 100644
--- a/frysk-gui/frysk/gui/monitor/MainWindow.java
+++ b/frysk-gui/frysk/gui/monitor/MainWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/MainWindowStatusBar.java b/frysk-gui/frysk/gui/monitor/MainWindowStatusBar.java
index 606cb5f..41f3661 100644
--- a/frysk-gui/frysk/gui/monitor/MainWindowStatusBar.java
+++ b/frysk-gui/frysk/gui/monitor/MainWindowStatusBar.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/MenuBar.java b/frysk-gui/frysk/gui/monitor/MenuBar.java
index 59686be..13c6f2c 100644
--- a/frysk-gui/frysk/gui/monitor/MenuBar.java
+++ b/frysk-gui/frysk/gui/monitor/MenuBar.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/NotifyingLabel.java b/frysk-gui/frysk/gui/monitor/NotifyingLabel.java
index 76de22b..ce6fdd2 100644
--- a/frysk-gui/frysk/gui/monitor/NotifyingLabel.java
+++ b/frysk-gui/frysk/gui/monitor/NotifyingLabel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ObjectFactory.java b/frysk-gui/frysk/gui/monitor/ObjectFactory.java
index 7506f38..c218ae3 100644
--- a/frysk-gui/frysk/gui/monitor/ObjectFactory.java
+++ b/frysk-gui/frysk/gui/monitor/ObjectFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ObservableLinkedList.java b/frysk-gui/frysk/gui/monitor/ObservableLinkedList.java
index 7afd443..74ddcc9 100644
--- a/frysk-gui/frysk/gui/monitor/ObservableLinkedList.java
+++ b/frysk-gui/frysk/gui/monitor/ObservableLinkedList.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ObserverItemRow.java b/frysk-gui/frysk/gui/monitor/ObserverItemRow.java
index fa6d570..ea3132d 100644
--- a/frysk-gui/frysk/gui/monitor/ObserverItemRow.java
+++ b/frysk-gui/frysk/gui/monitor/ObserverItemRow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ObserverItemsTable.java b/frysk-gui/frysk/gui/monitor/ObserverItemsTable.java
index fef9e54..e0b5023 100644
--- a/frysk-gui/frysk/gui/monitor/ObserverItemsTable.java
+++ b/frysk-gui/frysk/gui/monitor/ObserverItemsTable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ObserversDialog.java b/frysk-gui/frysk/gui/monitor/ObserversDialog.java
index 20c63e6..97e0afa 100644
--- a/frysk-gui/frysk/gui/monitor/ObserversDialog.java
+++ b/frysk-gui/frysk/gui/monitor/ObserversDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/PIDColumnDialog.java b/frysk-gui/frysk/gui/monitor/PIDColumnDialog.java
index 59a73d2..a65a9b1 100644
--- a/frysk-gui/frysk/gui/monitor/PIDColumnDialog.java
+++ b/frysk-gui/frysk/gui/monitor/PIDColumnDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/PIDMenu.java b/frysk-gui/frysk/gui/monitor/PIDMenu.java
index 4cec7e6..5044061 100644
--- a/frysk-gui/frysk/gui/monitor/PIDMenu.java
+++ b/frysk-gui/frysk/gui/monitor/PIDMenu.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/PreferenceWidget.java b/frysk-gui/frysk/gui/monitor/PreferenceWidget.java
index ace5045..6b664e2 100644
--- a/frysk-gui/frysk/gui/monitor/PreferenceWidget.java
+++ b/frysk-gui/frysk/gui/monitor/PreferenceWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/PreferencesWindow.java b/frysk-gui/frysk/gui/monitor/PreferencesWindow.java
index 95cd774..0491980 100644
--- a/frysk-gui/frysk/gui/monitor/PreferencesWindow.java
+++ b/frysk-gui/frysk/gui/monitor/PreferencesWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java b/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java
index 383cae2..22d12fe 100644
--- a/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java
+++ b/frysk-gui/frysk/gui/monitor/ProcWiseDataModel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/ProcWiseTreeView.java b/frysk-gui/frysk/gui/monitor/ProcWiseTreeView.java
index 6ddc85c..d77a7ce 100644
--- a/frysk-gui/frysk/gui/monitor/ProcWiseTreeView.java
+++ b/frysk-gui/frysk/gui/monitor/ProcWiseTreeView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/Saveable.java b/frysk-gui/frysk/gui/monitor/Saveable.java
index 02d664b..eab2c71 100644
--- a/frysk-gui/frysk/gui/monitor/Saveable.java
+++ b/frysk-gui/frysk/gui/monitor/Saveable.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/SaveableXXX.java b/frysk-gui/frysk/gui/monitor/SaveableXXX.java
index 9481035..b6d176a 100644
--- a/frysk-gui/frysk/gui/monitor/SaveableXXX.java
+++ b/frysk-gui/frysk/gui/monitor/SaveableXXX.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/SimpleComboBox.java b/frysk-gui/frysk/gui/monitor/SimpleComboBox.java
index d965696..22270eb 100644
--- a/frysk-gui/frysk/gui/monitor/SimpleComboBox.java
+++ b/frysk-gui/frysk/gui/monitor/SimpleComboBox.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/SplashScreenWindow.java b/frysk-gui/frysk/gui/monitor/SplashScreenWindow.java
index 41893d0..4fefcbe 100644
--- a/frysk-gui/frysk/gui/monitor/SplashScreenWindow.java
+++ b/frysk-gui/frysk/gui/monitor/SplashScreenWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/SummaryWidget.java b/frysk-gui/frysk/gui/monitor/SummaryWidget.java
index 33d477f..c55d028 100644
--- a/frysk-gui/frysk/gui/monitor/SummaryWidget.java
+++ b/frysk-gui/frysk/gui/monitor/SummaryWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/TearOffNotebook.java b/frysk-gui/frysk/gui/monitor/TearOffNotebook.java
index 72f78cb..bbabcfe 100644
--- a/frysk-gui/frysk/gui/monitor/TearOffNotebook.java
+++ b/frysk-gui/frysk/gui/monitor/TearOffNotebook.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/TrayIcon.java b/frysk-gui/frysk/gui/monitor/TrayIcon.java
index 59e68b4..2a13b0d 100644
--- a/frysk-gui/frysk/gui/monitor/TrayIcon.java
+++ b/frysk-gui/frysk/gui/monitor/TrayIcon.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/UniqueHashMap.java b/frysk-gui/frysk/gui/monitor/UniqueHashMap.java
index 2b1b6c69..8896e9c 100644
--- a/frysk-gui/frysk/gui/monitor/UniqueHashMap.java
+++ b/frysk-gui/frysk/gui/monitor/UniqueHashMap.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/WindowManager.java b/frysk-gui/frysk/gui/monitor/WindowManager.java
index 404d9af..fac602e 100644
--- a/frysk-gui/frysk/gui/monitor/WindowManager.java
+++ b/frysk-gui/frysk/gui/monitor/WindowManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/Action.java b/frysk-gui/frysk/gui/monitor/actions/Action.java
index 216ff21..1013abb 100644
--- a/frysk-gui/frysk/gui/monitor/actions/Action.java
+++ b/frysk-gui/frysk/gui/monitor/actions/Action.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/ActionManager.java b/frysk-gui/frysk/gui/monitor/actions/ActionManager.java
index 0ba516f..e17ece9 100644
--- a/frysk-gui/frysk/gui/monitor/actions/ActionManager.java
+++ b/frysk-gui/frysk/gui/monitor/actions/ActionManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/ActionPoint.java b/frysk-gui/frysk/gui/monitor/actions/ActionPoint.java
index e4c3e0b..da7253c 100644
--- a/frysk-gui/frysk/gui/monitor/actions/ActionPoint.java
+++ b/frysk-gui/frysk/gui/monitor/actions/ActionPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/AddTaskObserverAction.java b/frysk-gui/frysk/gui/monitor/actions/AddTaskObserverAction.java
index dbc83b3..8452a76 100644
--- a/frysk-gui/frysk/gui/monitor/actions/AddTaskObserverAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/AddTaskObserverAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/CaptureStackTraceAction.java b/frysk-gui/frysk/gui/monitor/actions/CaptureStackTraceAction.java
index 5fa507e..fa99140 100644
--- a/frysk-gui/frysk/gui/monitor/actions/CaptureStackTraceAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/CaptureStackTraceAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/GenericAction.java b/frysk-gui/frysk/gui/monitor/actions/GenericAction.java
index fe11ab7..b5b740a 100644
--- a/frysk-gui/frysk/gui/monitor/actions/GenericAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/GenericAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/GenericActionPoint.java b/frysk-gui/frysk/gui/monitor/actions/GenericActionPoint.java
index 9709742..247c323 100644
--- a/frysk-gui/frysk/gui/monitor/actions/GenericActionPoint.java
+++ b/frysk-gui/frysk/gui/monitor/actions/GenericActionPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/LogAction.java b/frysk-gui/frysk/gui/monitor/actions/LogAction.java
index 8d6190b..54b2ee8 100644
--- a/frysk-gui/frysk/gui/monitor/actions/LogAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/LogAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/NotifyUserAction.java b/frysk-gui/frysk/gui/monitor/actions/NotifyUserAction.java
index 60a35da..bf9c3f5 100644
--- a/frysk-gui/frysk/gui/monitor/actions/NotifyUserAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/NotifyUserAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/PrintProc.java b/frysk-gui/frysk/gui/monitor/actions/PrintProc.java
index 540e7a7..0717f33 100644
--- a/frysk-gui/frysk/gui/monitor/actions/PrintProc.java
+++ b/frysk-gui/frysk/gui/monitor/actions/PrintProc.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/PrintTask.java b/frysk-gui/frysk/gui/monitor/actions/PrintTask.java
index d20c187..6d2109f 100644
--- a/frysk-gui/frysk/gui/monitor/actions/PrintTask.java
+++ b/frysk-gui/frysk/gui/monitor/actions/PrintTask.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/PrintTaskBacktrace.java b/frysk-gui/frysk/gui/monitor/actions/PrintTaskBacktrace.java
index 176f908..a473fb5 100644
--- a/frysk-gui/frysk/gui/monitor/actions/PrintTaskBacktrace.java
+++ b/frysk-gui/frysk/gui/monitor/actions/PrintTaskBacktrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/ProcAction.java b/frysk-gui/frysk/gui/monitor/actions/ProcAction.java
index cf3292f..6ee1f60 100644
--- a/frysk-gui/frysk/gui/monitor/actions/ProcAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/ProcAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/Resume.java b/frysk-gui/frysk/gui/monitor/actions/Resume.java
index 1c1afb8..306fbaf 100644
--- a/frysk-gui/frysk/gui/monitor/actions/Resume.java
+++ b/frysk-gui/frysk/gui/monitor/actions/Resume.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/RunExternal.java b/frysk-gui/frysk/gui/monitor/actions/RunExternal.java
index f882345..f78efdf 100644
--- a/frysk-gui/frysk/gui/monitor/actions/RunExternal.java
+++ b/frysk-gui/frysk/gui/monitor/actions/RunExternal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/ShowMemWin.java b/frysk-gui/frysk/gui/monitor/actions/ShowMemWin.java
index 45d6a1c..a416940 100644
--- a/frysk-gui/frysk/gui/monitor/actions/ShowMemWin.java
+++ b/frysk-gui/frysk/gui/monitor/actions/ShowMemWin.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/ShowRegWin.java b/frysk-gui/frysk/gui/monitor/actions/ShowRegWin.java
index 2f26036..eef29ba 100644
--- a/frysk-gui/frysk/gui/monitor/actions/ShowRegWin.java
+++ b/frysk-gui/frysk/gui/monitor/actions/ShowRegWin.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/ShowSourceWin.java b/frysk-gui/frysk/gui/monitor/actions/ShowSourceWin.java
index f26d053..fe36dd5 100644
--- a/frysk-gui/frysk/gui/monitor/actions/ShowSourceWin.java
+++ b/frysk-gui/frysk/gui/monitor/actions/ShowSourceWin.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/Stop.java b/frysk-gui/frysk/gui/monitor/actions/Stop.java
index c421a79..4b7e01e 100644
--- a/frysk-gui/frysk/gui/monitor/actions/Stop.java
+++ b/frysk-gui/frysk/gui/monitor/actions/Stop.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/TaskAction.java b/frysk-gui/frysk/gui/monitor/actions/TaskAction.java
index 8cd7cc6..e34b4f3 100644
--- a/frysk-gui/frysk/gui/monitor/actions/TaskAction.java
+++ b/frysk-gui/frysk/gui/monitor/actions/TaskAction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/actions/TaskActionPoint.java b/frysk-gui/frysk/gui/monitor/actions/TaskActionPoint.java
index ada921c..ee2ec49 100644
--- a/frysk-gui/frysk/gui/monitor/actions/TaskActionPoint.java
+++ b/frysk-gui/frysk/gui/monitor/actions/TaskActionPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugDataModel.java b/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugDataModel.java
index 8a5182e..2d4b863 100644
--- a/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugDataModel.java
+++ b/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugDataModel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugHandler.java b/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugHandler.java
index 9ea230a..60393b7 100644
--- a/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugHandler.java
+++ b/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugHandler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugLogRecord.java b/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugLogRecord.java
index 8205bf7..be54597 100644
--- a/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugLogRecord.java
+++ b/frysk-gui/frysk/gui/monitor/datamodels/CoreDebugLogRecord.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/datamodels/DataModel.java b/frysk-gui/frysk/gui/monitor/datamodels/DataModel.java
index f286465..6656468 100644
--- a/frysk-gui/frysk/gui/monitor/datamodels/DataModel.java
+++ b/frysk-gui/frysk/gui/monitor/datamodels/DataModel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/datamodels/DataModelManager.java b/frysk-gui/frysk/gui/monitor/datamodels/DataModelManager.java
index 412b667..87db968 100644
--- a/frysk-gui/frysk/gui/monitor/datamodels/DataModelManager.java
+++ b/frysk-gui/frysk/gui/monitor/datamodels/DataModelManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/Box.java b/frysk-gui/frysk/gui/monitor/eventviewer/Box.java
index 3ff4d61..d98d809 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/Box.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/Box.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/Event.java b/frysk-gui/frysk/gui/monitor/eventviewer/Event.java
index 824364c..f4867b9 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/Event.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/Event.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/EventManager.java b/frysk-gui/frysk/gui/monitor/eventviewer/EventManager.java
index c22eb6c..4c01e97 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/EventManager.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/EventManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/EventViewer2.java b/frysk-gui/frysk/gui/monitor/eventviewer/EventViewer2.java
index 6cd9ad0..d6c9aed 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/EventViewer2.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/EventViewer2.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidget.java b/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidget.java
index 6148732..7d9f2ac 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidget.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidget.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidgetList.java b/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidgetList.java
index 647ed01..c959123 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidgetList.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/EventViewerWidgetList.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/ProcBox.java b/frysk-gui/frysk/gui/monitor/eventviewer/ProcBox.java
index 816eb17..e4c49b2 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/ProcBox.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/ProcBox.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/ProcTimeLine.java b/frysk-gui/frysk/gui/monitor/eventviewer/ProcTimeLine.java
index 5918bbf..17032f7 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/ProcTimeLine.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/ProcTimeLine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/TaskTimeLine.java b/frysk-gui/frysk/gui/monitor/eventviewer/TaskTimeLine.java
index 77b472c..20bc4d1 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/TaskTimeLine.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/TaskTimeLine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLine.java b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLine.java
index 52079ad..4cece70 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLine.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineEndEvent.java b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineEndEvent.java
index 5cb806b..d210cb3 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineEndEvent.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineEndEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineSelectionManager.java b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineSelectionManager.java
index 1a0898c..f2dc33e 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineSelectionManager.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineSelectionManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineStartEvent.java b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineStartEvent.java
index 5327db1..5575829 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineStartEvent.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/TimeLineStartEvent.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ComboFactory.java b/frysk-gui/frysk/gui/monitor/filters/ComboFactory.java
index 454463b..a941443 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ComboFactory.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ComboFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/Filter.java b/frysk-gui/frysk/gui/monitor/filters/Filter.java
index 2047e16..0a18dc8 100644
--- a/frysk-gui/frysk/gui/monitor/filters/Filter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/Filter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/FilterManager.java b/frysk-gui/frysk/gui/monitor/filters/FilterManager.java
index 21493dc..c9dd274 100644
--- a/frysk-gui/frysk/gui/monitor/filters/FilterManager.java
+++ b/frysk-gui/frysk/gui/monitor/filters/FilterManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/FilterPoint.java b/frysk-gui/frysk/gui/monitor/filters/FilterPoint.java
index 7e4fc45..a25465e 100644
--- a/frysk-gui/frysk/gui/monitor/filters/FilterPoint.java
+++ b/frysk-gui/frysk/gui/monitor/filters/FilterPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/IntFilter.java b/frysk-gui/frysk/gui/monitor/filters/IntFilter.java
index ffc4774..0a5278f 100644
--- a/frysk-gui/frysk/gui/monitor/filters/IntFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/IntFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/IntFilterPoint.java b/frysk-gui/frysk/gui/monitor/filters/IntFilterPoint.java
index cab47c8..4056244 100644
--- a/frysk-gui/frysk/gui/monitor/filters/IntFilterPoint.java
+++ b/frysk-gui/frysk/gui/monitor/filters/IntFilterPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ProcCommandLineFilter.java b/frysk-gui/frysk/gui/monitor/filters/ProcCommandLineFilter.java
index 573dc0b..74cb45f 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ProcCommandLineFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ProcCommandLineFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ProcFilter.java b/frysk-gui/frysk/gui/monitor/filters/ProcFilter.java
index 62b025e..2e2c35b 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ProcFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ProcFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ProcFilterPoint.java b/frysk-gui/frysk/gui/monitor/filters/ProcFilterPoint.java
index 65afb70..9f0507c 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ProcFilterPoint.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ProcFilterPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ProcNameFilter.java b/frysk-gui/frysk/gui/monitor/filters/ProcNameFilter.java
index 39e79de..2a16f4a 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ProcNameFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ProcNameFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ProcParentNameFilter.java b/frysk-gui/frysk/gui/monitor/filters/ProcParentNameFilter.java
index 23257fa..d86ef5c 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ProcParentNameFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ProcParentNameFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/ProcPathFilter.java b/frysk-gui/frysk/gui/monitor/filters/ProcPathFilter.java
index af533da..8ab06cd 100644
--- a/frysk-gui/frysk/gui/monitor/filters/ProcPathFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/ProcPathFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/TaskFilter.java b/frysk-gui/frysk/gui/monitor/filters/TaskFilter.java
index 0246404..36097bf 100644
--- a/frysk-gui/frysk/gui/monitor/filters/TaskFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/TaskFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/TaskFilterPoint.java b/frysk-gui/frysk/gui/monitor/filters/TaskFilterPoint.java
index 6f1cb7c..afc1856 100644
--- a/frysk-gui/frysk/gui/monitor/filters/TaskFilterPoint.java
+++ b/frysk-gui/frysk/gui/monitor/filters/TaskFilterPoint.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/TaskProcCommandLineFilter.java b/frysk-gui/frysk/gui/monitor/filters/TaskProcCommandLineFilter.java
index b456b78..49a4aea 100644
--- a/frysk-gui/frysk/gui/monitor/filters/TaskProcCommandLineFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/TaskProcCommandLineFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/TaskProcNameFilter.java b/frysk-gui/frysk/gui/monitor/filters/TaskProcNameFilter.java
index b53b760..3b49be8 100644
--- a/frysk-gui/frysk/gui/monitor/filters/TaskProcNameFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/TaskProcNameFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/TaskProcParentNameFilter.java b/frysk-gui/frysk/gui/monitor/filters/TaskProcParentNameFilter.java
index 6dfa3fb..77d62ce 100644
--- a/frysk-gui/frysk/gui/monitor/filters/TaskProcParentNameFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/TaskProcParentNameFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/filters/TaskProcPathFilter.java b/frysk-gui/frysk/gui/monitor/filters/TaskProcPathFilter.java
index 4857480..39b4843 100644
--- a/frysk-gui/frysk/gui/monitor/filters/TaskProcPathFilter.java
+++ b/frysk-gui/frysk/gui/monitor/filters/TaskProcPathFilter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/ExitNotificationObserver.java b/frysk-gui/frysk/gui/monitor/observers/ExitNotificationObserver.java
index 76a65f1..03e4255 100644
--- a/frysk-gui/frysk/gui/monitor/observers/ExitNotificationObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/ExitNotificationObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/ObserverManager.java b/frysk-gui/frysk/gui/monitor/observers/ObserverManager.java
index 459df02..a2315fa 100644
--- a/frysk-gui/frysk/gui/monitor/observers/ObserverManager.java
+++ b/frysk-gui/frysk/gui/monitor/observers/ObserverManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/ObserverRoot.java b/frysk-gui/frysk/gui/monitor/observers/ObserverRoot.java
index b8a3539..43a86aa 100644
--- a/frysk-gui/frysk/gui/monitor/observers/ObserverRoot.java
+++ b/frysk-gui/frysk/gui/monitor/observers/ObserverRoot.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/ProgramObserver.java b/frysk-gui/frysk/gui/monitor/observers/ProgramObserver.java
index 29a6f4b..0bffff8 100644
--- a/frysk-gui/frysk/gui/monitor/observers/ProgramObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/ProgramObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/SysCallUtilyInfo.java b/frysk-gui/frysk/gui/monitor/observers/SysCallUtilyInfo.java
index fd6441b..9680fbb 100644
--- a/frysk-gui/frysk/gui/monitor/observers/SysCallUtilyInfo.java
+++ b/frysk-gui/frysk/gui/monitor/observers/SysCallUtilyInfo.java
@@ -11,8 +11,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskCloneObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskCloneObserver.java
index 904e0de..c0c3ce5 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskCloneObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskCloneObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskExecObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskExecObserver.java
index 75f171d..e4c2253 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskExecObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskExecObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskForkedObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskForkedObserver.java
index 57cc46d..1a60157 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskForkedObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskForkedObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskObserverRoot.java b/frysk-gui/frysk/gui/monitor/observers/TaskObserverRoot.java
index 255a9a4..92c0962 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskObserverRoot.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskObserverRoot.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java
index f402abd..21b448a 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskSignaledObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskSyscallObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskSyscallObserver.java
index f36b4a2..d63e8ed 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskSyscallObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskSyscallObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TaskTerminatingObserver.java b/frysk-gui/frysk/gui/monitor/observers/TaskTerminatingObserver.java
index 273a0fc..fc0473c 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TaskTerminatingObserver.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TaskTerminatingObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/monitor/observers/TestObserverSaveLoad.java b/frysk-gui/frysk/gui/monitor/observers/TestObserverSaveLoad.java
index 17ce014..81c29a3 100644
--- a/frysk-gui/frysk/gui/monitor/observers/TestObserverSaveLoad.java
+++ b/frysk-gui/frysk/gui/monitor/observers/TestObserverSaveLoad.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/BooleanPreference.java b/frysk-gui/frysk/gui/prefs/BooleanPreference.java
index 6d8f54a..935afc7 100644
--- a/frysk-gui/frysk/gui/prefs/BooleanPreference.java
+++ b/frysk-gui/frysk/gui/prefs/BooleanPreference.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/ColorPreference.java b/frysk-gui/frysk/gui/prefs/ColorPreference.java
index 646ffaa..b1e0ee1 100644
--- a/frysk-gui/frysk/gui/prefs/ColorPreference.java
+++ b/frysk-gui/frysk/gui/prefs/ColorPreference.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/FryskPreference.java b/frysk-gui/frysk/gui/prefs/FryskPreference.java
index 4c43412..c6a7cc0 100644
--- a/frysk-gui/frysk/gui/prefs/FryskPreference.java
+++ b/frysk-gui/frysk/gui/prefs/FryskPreference.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/IntPreference.java b/frysk-gui/frysk/gui/prefs/IntPreference.java
index 443a77f..efe6f6d 100644
--- a/frysk-gui/frysk/gui/prefs/IntPreference.java
+++ b/frysk-gui/frysk/gui/prefs/IntPreference.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/PreferenceEditor.java b/frysk-gui/frysk/gui/prefs/PreferenceEditor.java
index d20f0a3..8915be1 100644
--- a/frysk-gui/frysk/gui/prefs/PreferenceEditor.java
+++ b/frysk-gui/frysk/gui/prefs/PreferenceEditor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/PreferenceGroup.java b/frysk-gui/frysk/gui/prefs/PreferenceGroup.java
index 949191a..f2159a4 100644
--- a/frysk-gui/frysk/gui/prefs/PreferenceGroup.java
+++ b/frysk-gui/frysk/gui/prefs/PreferenceGroup.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/PreferenceManager.java b/frysk-gui/frysk/gui/prefs/PreferenceManager.java
index 267b73b..0e6d596 100644
--- a/frysk-gui/frysk/gui/prefs/PreferenceManager.java
+++ b/frysk-gui/frysk/gui/prefs/PreferenceManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/prefs/PreferenceWindow.java b/frysk-gui/frysk/gui/prefs/PreferenceWindow.java
index 8aee193..b11b0cc 100644
--- a/frysk-gui/frysk/gui/prefs/PreferenceWindow.java
+++ b/frysk-gui/frysk/gui/prefs/PreferenceWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/register/RegisterFormatDialog.java b/frysk-gui/frysk/gui/register/RegisterFormatDialog.java
index c01a66b..8fc2c34 100644
--- a/frysk-gui/frysk/gui/register/RegisterFormatDialog.java
+++ b/frysk-gui/frysk/gui/register/RegisterFormatDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/register/RegisterWindow.java b/frysk-gui/frysk/gui/register/RegisterWindow.java
index 8a6553e..7125f9b 100644
--- a/frysk-gui/frysk/gui/register/RegisterWindow.java
+++ b/frysk-gui/frysk/gui/register/RegisterWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/register/RegisterWindowFactory.java b/frysk-gui/frysk/gui/register/RegisterWindowFactory.java
index 41733c5..9bf02af 100644
--- a/frysk-gui/frysk/gui/register/RegisterWindowFactory.java
+++ b/frysk-gui/frysk/gui/register/RegisterWindowFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/sessions/DebugProcess.java b/frysk-gui/frysk/gui/sessions/DebugProcess.java
index 1aef302..9f893ac 100644
--- a/frysk-gui/frysk/gui/sessions/DebugProcess.java
+++ b/frysk-gui/frysk/gui/sessions/DebugProcess.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/sessions/Session.java b/frysk-gui/frysk/gui/sessions/Session.java
index eb93aa3..997507c 100644
--- a/frysk-gui/frysk/gui/sessions/Session.java
+++ b/frysk-gui/frysk/gui/sessions/Session.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/sessions/SessionManager.java b/frysk-gui/frysk/gui/sessions/SessionManager.java
index 80df1e6..422da22 100644
--- a/frysk-gui/frysk/gui/sessions/SessionManager.java
+++ b/frysk-gui/frysk/gui/sessions/SessionManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/sessions/WatchDescription.java b/frysk-gui/frysk/gui/sessions/WatchDescription.java
index 7e34504..cf8c6e6 100644
--- a/frysk-gui/frysk/gui/sessions/WatchDescription.java
+++ b/frysk-gui/frysk/gui/sessions/WatchDescription.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/sessions/WatchList.java b/frysk-gui/frysk/gui/sessions/WatchList.java
index 6edb17b..adc583c 100644
--- a/frysk-gui/frysk/gui/sessions/WatchList.java
+++ b/frysk-gui/frysk/gui/sessions/WatchList.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/sessions/WatchListListener.java b/frysk-gui/frysk/gui/sessions/WatchListListener.java
index 8634569..c931957 100644
--- a/frysk-gui/frysk/gui/sessions/WatchListListener.java
+++ b/frysk-gui/frysk/gui/sessions/WatchListListener.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/ColorConverter.java b/frysk-gui/frysk/gui/srcwin/ColorConverter.java
index 67bae99..741787a 100644
--- a/frysk-gui/frysk/gui/srcwin/ColorConverter.java
+++ b/frysk-gui/frysk/gui/srcwin/ColorConverter.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/CurrentStackView.java b/frysk-gui/frysk/gui/srcwin/CurrentStackView.java
index 737a1a3..ab74847 100644
--- a/frysk-gui/frysk/gui/srcwin/CurrentStackView.java
+++ b/frysk-gui/frysk/gui/srcwin/CurrentStackView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/InlineBuffer.java b/frysk-gui/frysk/gui/srcwin/InlineBuffer.java
index fe3e338..1774866 100644
--- a/frysk-gui/frysk/gui/srcwin/InlineBuffer.java
+++ b/frysk-gui/frysk/gui/srcwin/InlineBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/InlineSourceView.java b/frysk-gui/frysk/gui/srcwin/InlineSourceView.java
index 7661a66..b29f55c 100644
--- a/frysk-gui/frysk/gui/srcwin/InlineSourceView.java
+++ b/frysk-gui/frysk/gui/srcwin/InlineSourceView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/MixedView.java b/frysk-gui/frysk/gui/srcwin/MixedView.java
index 745f7ac..0145490 100644
--- a/frysk-gui/frysk/gui/srcwin/MixedView.java
+++ b/frysk-gui/frysk/gui/srcwin/MixedView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/SourceBuffer.java b/frysk-gui/frysk/gui/srcwin/SourceBuffer.java
index 5950415..93036cc 100644
--- a/frysk-gui/frysk/gui/srcwin/SourceBuffer.java
+++ b/frysk-gui/frysk/gui/srcwin/SourceBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/SourceView.java b/frysk-gui/frysk/gui/srcwin/SourceView.java
index 1f55231..5474910 100644
--- a/frysk-gui/frysk/gui/srcwin/SourceView.java
+++ b/frysk-gui/frysk/gui/srcwin/SourceView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/SourceWindow.java b/frysk-gui/frysk/gui/srcwin/SourceWindow.java
index 06a7a9e..d52f045 100644
--- a/frysk-gui/frysk/gui/srcwin/SourceWindow.java
+++ b/frysk-gui/frysk/gui/srcwin/SourceWindow.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java b/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java
index 652ee6c..7a00000 100644
--- a/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java
+++ b/frysk-gui/frysk/gui/srcwin/SourceWindowFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/StepDialog.java b/frysk-gui/frysk/gui/srcwin/StepDialog.java
index 3f3efd4..fbe3bb0 100644
--- a/frysk-gui/frysk/gui/srcwin/StepDialog.java
+++ b/frysk-gui/frysk/gui/srcwin/StepDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/ThreadSelectionDialog.java b/frysk-gui/frysk/gui/srcwin/ThreadSelectionDialog.java
index c7d9ba8..d4aac27 100644
--- a/frysk-gui/frysk/gui/srcwin/ThreadSelectionDialog.java
+++ b/frysk-gui/frysk/gui/srcwin/ThreadSelectionDialog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/VariableWatchView.java b/frysk-gui/frysk/gui/srcwin/VariableWatchView.java
index 0a8a551..336d1fd 100644
--- a/frysk-gui/frysk/gui/srcwin/VariableWatchView.java
+++ b/frysk-gui/frysk/gui/srcwin/VariableWatchView.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/View.java b/frysk-gui/frysk/gui/srcwin/View.java
index 4fcd56d..51934a1 100644
--- a/frysk-gui/frysk/gui/srcwin/View.java
+++ b/frysk-gui/frysk/gui/srcwin/View.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/prefs/SourceWinPreferenceGroup.java b/frysk-gui/frysk/gui/srcwin/prefs/SourceWinPreferenceGroup.java
index 147240a..69c6a30 100644
--- a/frysk-gui/frysk/gui/srcwin/prefs/SourceWinPreferenceGroup.java
+++ b/frysk-gui/frysk/gui/srcwin/prefs/SourceWinPreferenceGroup.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreference.java b/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreference.java
index d628d13..9d928a0 100644
--- a/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreference.java
+++ b/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreference.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreferenceGroup.java b/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreferenceGroup.java
index 782fc40..00ed8b5 100644
--- a/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreferenceGroup.java
+++ b/frysk-gui/frysk/gui/srcwin/prefs/SyntaxPreferenceGroup.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/tags/Tag.java b/frysk-gui/frysk/gui/srcwin/tags/Tag.java
index b5b0ccb..916320a 100644
--- a/frysk-gui/frysk/gui/srcwin/tags/Tag.java
+++ b/frysk-gui/frysk/gui/srcwin/tags/Tag.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/tags/Tagset.java b/frysk-gui/frysk/gui/srcwin/tags/Tagset.java
index 94fd9e5..db51a2b 100644
--- a/frysk-gui/frysk/gui/srcwin/tags/Tagset.java
+++ b/frysk-gui/frysk/gui/srcwin/tags/Tagset.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/srcwin/tags/TagsetManager.java b/frysk-gui/frysk/gui/srcwin/tags/TagsetManager.java
index 9445bc7..6a10b9b 100644
--- a/frysk-gui/frysk/gui/srcwin/tags/TagsetManager.java
+++ b/frysk-gui/frysk/gui/srcwin/tags/TagsetManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/terminal/TermWindow.java b/frysk-gui/frysk/gui/terminal/TermWindow.java
index 59ec44f..c6bcad4 100644
--- a/frysk-gui/frysk/gui/terminal/TermWindow.java
+++ b/frysk-gui/frysk/gui/terminal/TermWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/GuiTestCase.java b/frysk-gui/frysk/gui/test/GuiTestCase.java
index 12b1ff9..b222de0 100644
--- a/frysk-gui/frysk/gui/test/GuiTestCase.java
+++ b/frysk-gui/frysk/gui/test/GuiTestCase.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/StressTestJGMemory.java b/frysk-gui/frysk/gui/test/StressTestJGMemory.java
index da925c5..d994d87 100644
--- a/frysk-gui/frysk/gui/test/StressTestJGMemory.java
+++ b/frysk-gui/frysk/gui/test/StressTestJGMemory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestActionManager.java b/frysk-gui/frysk/gui/test/TestActionManager.java
index aaad333..4577650 100644
--- a/frysk-gui/frysk/gui/test/TestActionManager.java
+++ b/frysk-gui/frysk/gui/test/TestActionManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestFilterManager.java b/frysk-gui/frysk/gui/test/TestFilterManager.java
index 376dfaf..2e89650 100644
--- a/frysk-gui/frysk/gui/test/TestFilterManager.java
+++ b/frysk-gui/frysk/gui/test/TestFilterManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestIconManager.java b/frysk-gui/frysk/gui/test/TestIconManager.java
index 220d32a..45aa79c 100644
--- a/frysk-gui/frysk/gui/test/TestIconManager.java
+++ b/frysk-gui/frysk/gui/test/TestIconManager.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestJGMemory.java b/frysk-gui/frysk/gui/test/TestJGMemory.java
index 4f2695e..71e72d7 100644
--- a/frysk-gui/frysk/gui/test/TestJGMemory.java
+++ b/frysk-gui/frysk/gui/test/TestJGMemory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestPrototypeCopying.java b/frysk-gui/frysk/gui/test/TestPrototypeCopying.java
index c138408..7a8724c 100644
--- a/frysk-gui/frysk/gui/test/TestPrototypeCopying.java
+++ b/frysk-gui/frysk/gui/test/TestPrototypeCopying.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestSessionSaveLoad.java b/frysk-gui/frysk/gui/test/TestSessionSaveLoad.java
index 2f332b1..2d28ce9 100644
--- a/frysk-gui/frysk/gui/test/TestSessionSaveLoad.java
+++ b/frysk-gui/frysk/gui/test/TestSessionSaveLoad.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestTagsetSaveLoad.java b/frysk-gui/frysk/gui/test/TestTagsetSaveLoad.java
index 6d986bc..43fe996 100644
--- a/frysk-gui/frysk/gui/test/TestTagsetSaveLoad.java
+++ b/frysk-gui/frysk/gui/test/TestTagsetSaveLoad.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // type filter text
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/TestWindowFactorization.java b/frysk-gui/frysk/gui/test/TestWindowFactorization.java
index 6680e09..0c28e59 100644
--- a/frysk-gui/frysk/gui/test/TestWindowFactorization.java
+++ b/frysk-gui/frysk/gui/test/TestWindowFactorization.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/AbstractGuiClass.py b/frysk-gui/frysk/gui/test/dogtail_scripts/AbstractGuiClass.py
index ac38549..cf04573 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/AbstractGuiClass.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/AbstractGuiClass.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/DebugExistingProcessDialog.py b/frysk-gui/frysk/gui/test/dogtail_scripts/DebugExistingProcessDialog.py
index 92b8f9b..7ada832 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/DebugExistingProcessDialog.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/DebugExistingProcessDialog.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/DebugProcess.py b/frysk-gui/frysk/gui/test/dogtail_scripts/DebugProcess.py
index 3ef45d6..cd93375 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/DebugProcess.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/DebugProcess.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/DebugSession.py b/frysk-gui/frysk/gui/test/dogtail_scripts/DebugSession.py
index 8b4367b..f3ea79a 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/DebugSession.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/DebugSession.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHandler.py b/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHandler.py
index 3756e99..426d50e 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHandler.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHandler.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHelpers.py b/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHelpers.py
index 28182a8..58b5c3e 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHelpers.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/FryskHelpers.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/Observer.py b/frysk-gui/frysk/gui/test/dogtail_scripts/Observer.py
index 868415d..af4cfda 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/Observer.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/Observer.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverElement.py b/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverElement.py
index ccc3a48..d0f2d8d 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverElement.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverElement.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverHandler.py b/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverHandler.py
index 962e933..5296954 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverHandler.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverHandler.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverPoints.py b/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverPoints.py
index 3337b36..d55d235 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverPoints.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/ObserverPoints.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/TestClassTemplate.py b/frysk-gui/frysk/gui/test/dogtail_scripts/TestClassTemplate.py
index bf6d417..62cabeb 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/TestClassTemplate.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/TestClassTemplate.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/TestRunObject.py b/frysk-gui/frysk/gui/test/dogtail_scripts/TestRunObject.py
index 3e3a6e0..07283ad 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/TestRunObject.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/TestRunObject.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/credits.py b/frysk-gui/frysk/gui/test/dogtail_scripts/credits.py
index 000ee9f..0365368 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/credits.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/credits.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/druid.py b/frysk-gui/frysk/gui/test/dogtail_scripts/druid.py
index 37374cd..79582f8 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/druid.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/druid.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/eventViewerAccessibilityInfo.py b/frysk-gui/frysk/gui/test/dogtail_scripts/eventViewerAccessibilityInfo.py
index 0c5f446..54b9a00 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/eventViewerAccessibilityInfo.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/eventViewerAccessibilityInfo.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/fryskTestCase.py b/frysk-gui/frysk/gui/test/dogtail_scripts/fryskTestCase.py
index 0e20c71..a52ba16 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/fryskTestCase.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/fryskTestCase.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/frysk_suite.in b/frysk-gui/frysk/gui/test/dogtail_scripts/frysk_suite.in
index 3640612..cff7027 100755
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/frysk_suite.in
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/frysk_suite.in
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/guiWalkTest.py b/frysk-gui/frysk/gui/test/dogtail_scripts/guiWalkTest.py
index 14f9e81..94ffcd5 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/guiWalkTest.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/guiWalkTest.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/license.py b/frysk-gui/frysk/gui/test/dogtail_scripts/license.py
index b35e958..872bb7c 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/license.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/license.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/observerData.py b/frysk-gui/frysk/gui/test/dogtail_scripts/observerData.py
index e906dad..c52f091 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/observerData.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/observerData.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2866.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2866.py
index 9b74f07..2bb1139 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2866.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2866.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2985.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2985.py
index 0d563e3..1ba850e 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2985.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/Test2985.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObservers.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObservers.py
index 64e56a0..56c18b3 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObservers.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObservers.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObserversfromDataModel.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObserversfromDataModel.py
index f7e6321..43d012c 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObserversfromDataModel.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCreateObserversfromDataModel.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCredits.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCredits.py
index 64e1124..55792a2 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCredits.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestCredits.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestDruid.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestDruid.py
index 673a51d..3cf4f65 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestDruid.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestDruid.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerButtons.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerButtons.py
index 242fc7e..3e1ef70 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerButtons.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerButtons.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerMarkers.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerMarkers.py
index a05d5e5..9d59e57 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerMarkers.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestEventViewerMarkers.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestLicense.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestLicense.py
index 986340a..767a9b7 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestLicense.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestLicense.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestStressDruid.py b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestStressDruid.py
index 7eeab6f..80c159c 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestStressDruid.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/obsolete/TestStressDruid.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/run_suite.in b/frysk-gui/frysk/gui/test/dogtail_scripts/run_suite.in
index d0ccc9a..7eda52c 100755
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/run_suite.in
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/run_suite.in
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/stressDruid.py b/frysk-gui/frysk/gui/test/dogtail_scripts/stressDruid.py
index b3d064c..6825461 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/stressDruid.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/stressDruid.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/test2866.py b/frysk-gui/frysk/gui/test/dogtail_scripts/test2866.py
index 206638a..4005c57 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/test2866.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/test2866.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/test2985.py b/frysk-gui/frysk/gui/test/dogtail_scripts/test2985.py
index 58d9a9e..4a2e68f 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/test2985.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/test2985.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/test3380.py b/frysk-gui/frysk/gui/test/dogtail_scripts/test3380.py
index 4efc5e3..d0e04b7 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/test3380.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/test3380.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/viewerButtons.py b/frysk-gui/frysk/gui/test/dogtail_scripts/viewerButtons.py
index 0e17ba8..ffeaac7 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/viewerButtons.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/viewerButtons.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/gui/test/dogtail_scripts/viewerMarkers.py b/frysk-gui/frysk/gui/test/dogtail_scripts/viewerMarkers.py
index 49e7e2f..14999de 100644
--- a/frysk-gui/frysk/gui/test/dogtail_scripts/viewerMarkers.py
+++ b/frysk-gui/frysk/gui/test/dogtail_scripts/viewerMarkers.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/pkglibdir/ftail.py b/frysk-gui/frysk/pkglibdir/ftail.py
index b37ec48..51bb609 100755
--- a/frysk-gui/frysk/pkglibdir/ftail.py
+++ b/frysk-gui/frysk/pkglibdir/ftail.py
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/pkglibdir/ftail.xml-in b/frysk-gui/frysk/pkglibdir/ftail.xml-in
index 7a4cacc..db71f0c 100644
--- a/frysk-gui/frysk/pkglibdir/ftail.xml-in
+++ b/frysk-gui/frysk/pkglibdir/ftail.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/pkglibdir/funit.java b/frysk-gui/frysk/pkglibdir/funit.java
index f108ecf..4ccd7d5 100755
--- a/frysk-gui/frysk/pkglibdir/funit.java
+++ b/frysk-gui/frysk/pkglibdir/funit.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/pkglibdir/funit.xml-in b/frysk-gui/frysk/pkglibdir/funit.xml-in
index 8514a6b..daf4ab7 100644
--- a/frysk-gui/frysk/pkglibdir/funit.xml-in
+++ b/frysk-gui/frysk/pkglibdir/funit.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-gui/frysk/vtecli/ConsoleWindow.java b/frysk-gui/frysk/vtecli/ConsoleWindow.java
index b2b69a7..adc6834 100644
--- a/frysk-gui/frysk/vtecli/ConsoleWindow.java
+++ b/frysk-gui/frysk/vtecli/ConsoleWindow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/Makefile.am b/frysk-imports/Makefile.am
index 94c68d0..cb4bc4f 100644
--- a/frysk-imports/Makefile.am
+++ b/frysk-imports/Makefile.am
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/bootstrap.sh b/frysk-imports/bootstrap.sh
index cb0c0a5..b8d239b 100755
--- a/frysk-imports/bootstrap.sh
+++ b/frysk-imports/bootstrap.sh
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/configure.ac b/frysk-imports/configure.ac
index 9e9f960..b9a6c32 100644
--- a/frysk-imports/configure.ac
+++ b/frysk-imports/configure.ac
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/include/fixme-asm.h b/frysk-imports/include/fixme-asm.h
index c4606a9..1ea6ab0 100644
--- a/frysk-imports/include/fixme-asm.h
+++ b/frysk-imports/include/fixme-asm.h
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/include/frysk-asm.h b/frysk-imports/include/frysk-asm.h
index e2520a1..779e93b 100644
--- a/frysk-imports/include/frysk-asm.h
+++ b/frysk-imports/include/frysk-asm.h
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/include/funit-util.h b/frysk-imports/include/funit-util.h
index a9ccfeb..b413506 100644
--- a/frysk-imports/include/funit-util.h
+++ b/frysk-imports/include/funit-util.h
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/include/linux.syscall.h b/frysk-imports/include/linux.syscall.h
index 959d1ea..37fb7e8 100644
--- a/frysk-imports/include/linux.syscall.h
+++ b/frysk-imports/include/linux.syscall.h
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/include/ptrace_wait.h b/frysk-imports/include/ptrace_wait.h
index ca48031..06ded9f 100644
--- a/frysk-imports/include/ptrace_wait.h
+++ b/frysk-imports/include/ptrace_wait.h
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/Makefile.am b/frysk-imports/tests/Makefile.am
index 8c96f76..cdd2a90 100644
--- a/frysk-imports/tests/Makefile.am
+++ b/frysk-imports/tests/Makefile.am
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/cmdline/dump.c b/frysk-imports/tests/cmdline/dump.c
index d8c11ad..4685b62 100644
--- a/frysk-imports/tests/cmdline/dump.c
+++ b/frysk-imports/tests/cmdline/dump.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/cmdline/print.c b/frysk-imports/tests/cmdline/print.c
index c8eb9f9..fd02925 100644
--- a/frysk-imports/tests/cmdline/print.c
+++ b/frysk-imports/tests/cmdline/print.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2130/threadexec.c b/frysk-imports/tests/frysk2130/threadexec.c
index e607696..446d8f4 100644
--- a/frysk-imports/tests/frysk2130/threadexec.c
+++ b/frysk-imports/tests/frysk2130/threadexec.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2595/ptrace_after_exec.c b/frysk-imports/tests/frysk2595/ptrace_after_exec.c
index 4ee2d5c..def1bd4 100644
--- a/frysk-imports/tests/frysk2595/ptrace_after_exec.c
+++ b/frysk-imports/tests/frysk2595/ptrace_after_exec.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c b/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c
index b88bacc..e7b69d0 100644
--- a/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c
+++ b/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c b/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c
index a1fd02f..077b2b6 100644
--- a/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c
+++ b/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c b/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c
index 1ad0ee1..191f289 100644
--- a/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c
+++ b/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c b/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c
index b056deb..ee05eb6 100644
--- a/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c
+++ b/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2760/TestBarrier.cxx b/frysk-imports/tests/frysk2760/TestBarrier.cxx
index 60723f9..51a3927 100644
--- a/frysk-imports/tests/frysk2760/TestBarrier.cxx
+++ b/frysk-imports/tests/frysk2760/TestBarrier.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk2760/TestBarrier.java b/frysk-imports/tests/frysk2760/TestBarrier.java
index a629c43..8c4fcb0 100644
--- a/frysk-imports/tests/frysk2760/TestBarrier.java
+++ b/frysk-imports/tests/frysk2760/TestBarrier.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3205/ptrace-detach-bad-signal.c b/frysk-imports/tests/frysk3205/ptrace-detach-bad-signal.c
index 293c6f6..399cee2 100644
--- a/frysk-imports/tests/frysk3205/ptrace-detach-bad-signal.c
+++ b/frysk-imports/tests/frysk3205/ptrace-detach-bad-signal.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3231/ptrace-detach-looses-signal.c b/frysk-imports/tests/frysk3231/ptrace-detach-looses-signal.c
index b8d14ff..538dbfb 100644
--- a/frysk-imports/tests/frysk3231/ptrace-detach-looses-signal.c
+++ b/frysk-imports/tests/frysk3231/ptrace-detach-looses-signal.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3381/f3381.c b/frysk-imports/tests/frysk3381/f3381.c
index 9dd4e41..8e44637 100644
--- a/frysk-imports/tests/frysk3381/f3381.c
+++ b/frysk-imports/tests/frysk3381/f3381.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3381/reparent-r.c b/frysk-imports/tests/frysk3381/reparent-r.c
index de617bc..05062f9 100644
--- a/frysk-imports/tests/frysk3381/reparent-r.c
+++ b/frysk-imports/tests/frysk3381/reparent-r.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3381/reparent.c b/frysk-imports/tests/frysk3381/reparent.c
index 1361a82..52c4239 100644
--- a/frysk-imports/tests/frysk3381/reparent.c
+++ b/frysk-imports/tests/frysk3381/reparent.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3486/waitpid-masked-sigchld.c b/frysk-imports/tests/frysk3486/waitpid-masked-sigchld.c
index b8d22b7..55e723e 100644
--- a/frysk-imports/tests/frysk3486/waitpid-masked-sigchld.c
+++ b/frysk-imports/tests/frysk3486/waitpid-masked-sigchld.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3491/x-state.c b/frysk-imports/tests/frysk3491/x-state.c
index 5c4c3c7..52cc915 100644
--- a/frysk-imports/tests/frysk3491/x-state.c
+++ b/frysk-imports/tests/frysk3491/x-state.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3525/exit47.c b/frysk-imports/tests/frysk3525/exit47.c
index 2516d68..b394ac5 100644
--- a/frysk-imports/tests/frysk3525/exit47.c
+++ b/frysk-imports/tests/frysk3525/exit47.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3595/detach-multi-thread.c b/frysk-imports/tests/frysk3595/detach-multi-thread.c
index 05db1ec..909c1c3 100644
--- a/frysk-imports/tests/frysk3595/detach-multi-thread.c
+++ b/frysk-imports/tests/frysk3595/detach-multi-thread.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3754/daemonreadproc.c b/frysk-imports/tests/frysk3754/daemonreadproc.c
index 114d728..f8cf5a7 100644
--- a/frysk-imports/tests/frysk3754/daemonreadproc.c
+++ b/frysk-imports/tests/frysk3754/daemonreadproc.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3754/readproc.c b/frysk-imports/tests/frysk3754/readproc.c
index 9766ed9..9bd348a 100644
--- a/frysk-imports/tests/frysk3754/readproc.c
+++ b/frysk-imports/tests/frysk3754/readproc.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk3997/ptrace_step_sig.c b/frysk-imports/tests/frysk3997/ptrace_step_sig.c
index 6f4dd10..7dd8390 100644
--- a/frysk-imports/tests/frysk3997/ptrace_step_sig.c
+++ b/frysk-imports/tests/frysk3997/ptrace_step_sig.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk4217/attachstop.c b/frysk-imports/tests/frysk4217/attachstop.c
index 473e50e..0e9fc5a 100644
--- a/frysk-imports/tests/frysk4217/attachstop.c
+++ b/frysk-imports/tests/frysk4217/attachstop.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk4282/MyProcName.java b/frysk-imports/tests/frysk4282/MyProcName.java
index 374bbf1..36e9e7b 100644
--- a/frysk-imports/tests/frysk4282/MyProcName.java
+++ b/frysk-imports/tests/frysk4282/MyProcName.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk4282/StackAccessors.java b/frysk-imports/tests/frysk4282/StackAccessors.java
index d943272..cbe16e0 100644
--- a/frysk-imports/tests/frysk4282/StackAccessors.java
+++ b/frysk-imports/tests/frysk4282/StackAccessors.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk4330/stopkills.c b/frysk-imports/tests/frysk4330/stopkills.c
index a069c4c..3c533c9 100644
--- a/frysk-imports/tests/frysk4330/stopkills.c
+++ b/frysk-imports/tests/frysk4330/stopkills.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-imports/tests/frysk4704/vdso-permissions.c b/frysk-imports/tests/frysk4704/vdso-permissions.c
index 3054236..79b5134 100644
--- a/frysk-imports/tests/frysk4704/vdso-permissions.c
+++ b/frysk-imports/tests/frysk4704/vdso-permissions.c
@@ -12,7 +12,7 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with Red Hat elfutils; if not, write to the Free Software Foundation,
+   with Red Hat elfutils.  If not, see <http://www.gnu.org/licenses/>.
    Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA.
 
    In addition, as a special exception, Red Hat, Inc. gives You the
diff --git a/frysk-sys/Makefile.am b/frysk-sys/Makefile.am
index 6e8e9a2..f69fd01 100644
--- a/frysk-sys/Makefile.am
+++ b/frysk-sys/Makefile.am
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/bootstrap.sh b/frysk-sys/bootstrap.sh
index 076cb94..91e8a96 100755
--- a/frysk-sys/bootstrap.sh
+++ b/frysk-sys/bootstrap.sh
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/configure.ac b/frysk-sys/configure.ac
index 675ee80..6a1e0ca 100644
--- a/frysk-sys/configure.ac
+++ b/frysk-sys/configure.ac
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/InternalException.java b/frysk-sys/frysk/InternalException.java
index fe85caa..74171f9 100644
--- a/frysk-sys/frysk/InternalException.java
+++ b/frysk-sys/frysk/InternalException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/UserException.java b/frysk-sys/frysk/UserException.java
index 76ba9f7..6c03849 100644
--- a/frysk-sys/frysk/UserException.java
+++ b/frysk-sys/frysk/UserException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/BuildCompiler.java b/frysk-sys/frysk/config/BuildCompiler.java
index 95202d2..85c4c99 100644
--- a/frysk-sys/frysk/config/BuildCompiler.java
+++ b/frysk-sys/frysk/config/BuildCompiler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/Config.java b/frysk-sys/frysk/config/Config.java
index 4aed123..70c4824 100644
--- a/frysk-sys/frysk/config/Config.java
+++ b/frysk-sys/frysk/config/Config.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/FryskVersion.java b/frysk-sys/frysk/config/FryskVersion.java
index 6bdfe9d..b8ef17a 100644
--- a/frysk-sys/frysk/config/FryskVersion.java
+++ b/frysk-sys/frysk/config/FryskVersion.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/Host.java b/frysk-sys/frysk/config/Host.java
index bc6d9b7..ba776a1 100644
--- a/frysk-sys/frysk/config/Host.java
+++ b/frysk-sys/frysk/config/Host.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/Prefix.java b/frysk-sys/frysk/config/Prefix.java
index e66059e..bf618f3 100644
--- a/frysk-sys/frysk/config/Prefix.java
+++ b/frysk-sys/frysk/config/Prefix.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/PrefixFactory.java b/frysk-sys/frysk/config/PrefixFactory.java
index 54b4f0f..af444c2 100644
--- a/frysk-sys/frysk/config/PrefixFactory.java
+++ b/frysk-sys/frysk/config/PrefixFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/Runtime.java b/frysk-sys/frysk/config/Runtime.java
index 77fe1ff..f4ddee5 100644
--- a/frysk-sys/frysk/config/Runtime.java
+++ b/frysk-sys/frysk/config/Runtime.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/TestBuildCompiler.java b/frysk-sys/frysk/config/TestBuildCompiler.java
index 13a3081..9cc0b43 100644
--- a/frysk-sys/frysk/config/TestBuildCompiler.java
+++ b/frysk-sys/frysk/config/TestBuildCompiler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/TestPrefix.java b/frysk-sys/frysk/config/TestPrefix.java
index c9f73cb..fc12617 100644
--- a/frysk-sys/frysk/config/TestPrefix.java
+++ b/frysk-sys/frysk/config/TestPrefix.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/jni/BuildCompiler.cxx b/frysk-sys/frysk/config/jni/BuildCompiler.cxx
index ff741ff..d1ea223 100644
--- a/frysk-sys/frysk/config/jni/BuildCompiler.cxx
+++ b/frysk-sys/frysk/config/jni/BuildCompiler.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/jni/FryskVersion.cxx-in b/frysk-sys/frysk/config/jni/FryskVersion.cxx-in
index 1f4e101..4c2fa1b 100644
--- a/frysk-sys/frysk/config/jni/FryskVersion.cxx-in
+++ b/frysk-sys/frysk/config/jni/FryskVersion.cxx-in
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/jni/Host.cxx-in b/frysk-sys/frysk/config/jni/Host.cxx-in
index 2215ca7..e21e853 100644
--- a/frysk-sys/frysk/config/jni/Host.cxx-in
+++ b/frysk-sys/frysk/config/jni/Host.cxx-in
@@ -14,8 +14,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in b/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in
index 5c8d9e4..66e2211 100644
--- a/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in
+++ b/frysk-sys/frysk/config/jni/PrefixFactory.cxx-in
@@ -14,8 +14,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/config/jni/Runtime.cxx b/frysk-sys/frysk/config/jni/Runtime.cxx
index d5dd54d..fe2f252 100644
--- a/frysk-sys/frysk/config/jni/Runtime.cxx
+++ b/frysk-sys/frysk/config/jni/Runtime.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/Child.java b/frysk-sys/frysk/expunit/Child.java
index 69281ef..4b79b79 100644
--- a/frysk-sys/frysk/expunit/Child.java
+++ b/frysk-sys/frysk/expunit/Child.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/EndOfFileException.java b/frysk-sys/frysk/expunit/EndOfFileException.java
index 48051c5..bab4e58 100644
--- a/frysk-sys/frysk/expunit/EndOfFileException.java
+++ b/frysk-sys/frysk/expunit/EndOfFileException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/Equals.java b/frysk-sys/frysk/expunit/Equals.java
index d90c49b..5ad5a8d 100644
--- a/frysk-sys/frysk/expunit/Equals.java
+++ b/frysk-sys/frysk/expunit/Equals.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/Expect.java b/frysk-sys/frysk/expunit/Expect.java
index d2542f6..a7999e0 100644
--- a/frysk-sys/frysk/expunit/Expect.java
+++ b/frysk-sys/frysk/expunit/Expect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/Match.java b/frysk-sys/frysk/expunit/Match.java
index 8e24262..1e20348 100644
--- a/frysk-sys/frysk/expunit/Match.java
+++ b/frysk-sys/frysk/expunit/Match.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/MatchException.java b/frysk-sys/frysk/expunit/MatchException.java
index bc81d20..d3b5385 100644
--- a/frysk-sys/frysk/expunit/MatchException.java
+++ b/frysk-sys/frysk/expunit/MatchException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/Regex.java b/frysk-sys/frysk/expunit/Regex.java
index 197a05e..84d4f31 100644
--- a/frysk-sys/frysk/expunit/Regex.java
+++ b/frysk-sys/frysk/expunit/Regex.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/TerminationException.java b/frysk-sys/frysk/expunit/TerminationException.java
index 2f126e0..214c4b9 100644
--- a/frysk-sys/frysk/expunit/TerminationException.java
+++ b/frysk-sys/frysk/expunit/TerminationException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/TestEquals.java b/frysk-sys/frysk/expunit/TestEquals.java
index 74780b1..67e5891 100644
--- a/frysk-sys/frysk/expunit/TestEquals.java
+++ b/frysk-sys/frysk/expunit/TestEquals.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/TestExpect.java b/frysk-sys/frysk/expunit/TestExpect.java
index b7b2f83..58005e1 100644
--- a/frysk-sys/frysk/expunit/TestExpect.java
+++ b/frysk-sys/frysk/expunit/TestExpect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/TestRegex.java b/frysk-sys/frysk/expunit/TestRegex.java
index ba277bf..99df9e7 100644
--- a/frysk-sys/frysk/expunit/TestRegex.java
+++ b/frysk-sys/frysk/expunit/TestRegex.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/TimeoutException.java b/frysk-sys/frysk/expunit/TimeoutException.java
index 9d0d3d4..5019c38 100644
--- a/frysk-sys/frysk/expunit/TimeoutException.java
+++ b/frysk-sys/frysk/expunit/TimeoutException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/expunit/WaitObserver.java b/frysk-sys/frysk/expunit/WaitObserver.java
index 3ea8ce1..837ecf1 100644
--- a/frysk-sys/frysk/expunit/WaitObserver.java
+++ b/frysk-sys/frysk/expunit/WaitObserver.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/KernelMatch.java b/frysk-sys/frysk/junit/KernelMatch.java
index 7710f10..4b4ccbe 100644
--- a/frysk-sys/frysk/junit/KernelMatch.java
+++ b/frysk-sys/frysk/junit/KernelMatch.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/KernelVersion.java b/frysk-sys/frysk/junit/KernelVersion.java
index 4e13c65..177eb24 100644
--- a/frysk-sys/frysk/junit/KernelVersion.java
+++ b/frysk-sys/frysk/junit/KernelVersion.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/Result.java b/frysk-sys/frysk/junit/Result.java
index 84b80c3..dc42d10 100644
--- a/frysk-sys/frysk/junit/Result.java
+++ b/frysk-sys/frysk/junit/Result.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/Results.java b/frysk-sys/frysk/junit/Results.java
index d66b94e..129b432 100644
--- a/frysk-sys/frysk/junit/Results.java
+++ b/frysk-sys/frysk/junit/Results.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/Runner.java b/frysk-sys/frysk/junit/Runner.java
index add01be..23e9604 100755
--- a/frysk-sys/frysk/junit/Runner.java
+++ b/frysk-sys/frysk/junit/Runner.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/TestAsserts.java b/frysk-sys/frysk/junit/TestAsserts.java
index 76b1244..b514505 100644
--- a/frysk-sys/frysk/junit/TestAsserts.java
+++ b/frysk-sys/frysk/junit/TestAsserts.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/junit/TestCase.java b/frysk-sys/frysk/junit/TestCase.java
index a484dc5..0955f3a 100644
--- a/frysk-sys/frysk/junit/TestCase.java
+++ b/frysk-sys/frysk/junit/TestCase.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/pkgdatadir/libtest.c.source b/frysk-sys/frysk/pkgdatadir/libtest.c.source
index aa36ea2..02cb990 100644
--- a/frysk-sys/frysk/pkgdatadir/libtest.c.source
+++ b/frysk-sys/frysk/pkgdatadir/libtest.c.source
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/pkgdatadir/segfault.c.source b/frysk-sys/frysk/pkgdatadir/segfault.c.source
index b2e617b..f316971 100644
--- a/frysk-sys/frysk/pkgdatadir/segfault.c.source
+++ b/frysk-sys/frysk/pkgdatadir/segfault.c.source
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/pkglibdir/fsystest.xml-in b/frysk-sys/frysk/pkglibdir/fsystest.xml-in
index 1d3a2cc..5cc886f 100644
--- a/frysk-sys/frysk/pkglibdir/fsystest.xml-in
+++ b/frysk-sys/frysk/pkglibdir/fsystest.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/pkglibdir/funit-procmask.c b/frysk-sys/frysk/pkglibdir/funit-procmask.c
index edb2301..e1d2a5d 100644
--- a/frysk-sys/frysk/pkglibdir/funit-procmask.c
+++ b/frysk-sys/frysk/pkglibdir/funit-procmask.c
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/pkglibdir/funit-procmask.xml-in b/frysk-sys/frysk/pkglibdir/funit-procmask.xml-in
index cc67326..8c4fcc6 100644
--- a/frysk-sys/frysk/pkglibdir/funit-procmask.xml-in
+++ b/frysk-sys/frysk/pkglibdir/funit-procmask.xml-in
@@ -16,8 +16,7 @@
  General Public License for more details.
  
  You should have received a copy of the GNU General Public License
- along with FRYSK; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
  
  In addition, as a special exception, Red Hat, Inc. gives You the
  additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/Callers.java b/frysk-sys/frysk/rsl/Callers.java
index 5c1d84e..692261a 100644
--- a/frysk-sys/frysk/rsl/Callers.java
+++ b/frysk-sys/frysk/rsl/Callers.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/Log.java b/frysk-sys/frysk/rsl/Log.java
index 27f1245..41f6e75 100644
--- a/frysk-sys/frysk/rsl/Log.java
+++ b/frysk-sys/frysk/rsl/Log.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/LogFactory.java b/frysk-sys/frysk/rsl/LogFactory.java
index 3832145..8d20eb0 100644
--- a/frysk-sys/frysk/rsl/LogFactory.java
+++ b/frysk-sys/frysk/rsl/LogFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/LogOption.java b/frysk-sys/frysk/rsl/LogOption.java
index 3f18fe4..01a3cbe 100644
--- a/frysk-sys/frysk/rsl/LogOption.java
+++ b/frysk-sys/frysk/rsl/LogOption.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/Node.java b/frysk-sys/frysk/rsl/Node.java
index cd3534e..48f4279 100644
--- a/frysk-sys/frysk/rsl/Node.java
+++ b/frysk-sys/frysk/rsl/Node.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/Printer.java b/frysk-sys/frysk/rsl/Printer.java
index 5ebec05..9996bb1 100644
--- a/frysk-sys/frysk/rsl/Printer.java
+++ b/frysk-sys/frysk/rsl/Printer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/Setting.java b/frysk-sys/frysk/rsl/Setting.java
index b2ca236..1cab6da 100644
--- a/frysk-sys/frysk/rsl/Setting.java
+++ b/frysk-sys/frysk/rsl/Setting.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/TestCallers.java b/frysk-sys/frysk/rsl/TestCallers.java
index 51133af..a833be6 100644
--- a/frysk-sys/frysk/rsl/TestCallers.java
+++ b/frysk-sys/frysk/rsl/TestCallers.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/TestCompletion.java b/frysk-sys/frysk/rsl/TestCompletion.java
index 92bd4d3..2b8558c 100644
--- a/frysk-sys/frysk/rsl/TestCompletion.java
+++ b/frysk-sys/frysk/rsl/TestCompletion.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/TestLib.java b/frysk-sys/frysk/rsl/TestLib.java
index 1d0b384..fad421f 100644
--- a/frysk-sys/frysk/rsl/TestLib.java
+++ b/frysk-sys/frysk/rsl/TestLib.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/TestLog.java b/frysk-sys/frysk/rsl/TestLog.java
index 64a8b95..74b236d 100644
--- a/frysk-sys/frysk/rsl/TestLog.java
+++ b/frysk-sys/frysk/rsl/TestLog.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/TestOptions.java b/frysk-sys/frysk/rsl/TestOptions.java
index e9bf1c8..3a701e6 100644
--- a/frysk-sys/frysk/rsl/TestOptions.java
+++ b/frysk-sys/frysk/rsl/TestOptions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/rsl/TestSetting.java b/frysk-sys/frysk/rsl/TestSetting.java
index dcc8efe..bc6ed0b 100644
--- a/frysk-sys/frysk/rsl/TestSetting.java
+++ b/frysk-sys/frysk/rsl/TestSetting.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/AuditLibs.java b/frysk-sys/frysk/sys/AuditLibs.java
index 6679d86..587bf49 100644
--- a/frysk-sys/frysk/sys/AuditLibs.java
+++ b/frysk-sys/frysk/sys/AuditLibs.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Environ.java b/frysk-sys/frysk/sys/Environ.java
index 6400484..196b0bb 100644
--- a/frysk-sys/frysk/sys/Environ.java
+++ b/frysk-sys/frysk/sys/Environ.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Errno.java-sh b/frysk-sys/frysk/sys/Errno.java-sh
index c87ae21..2108f8f 100644
--- a/frysk-sys/frysk/sys/Errno.java-sh
+++ b/frysk-sys/frysk/sys/Errno.java-sh
@@ -14,8 +14,7 @@ cat <<EOF
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Execute.java b/frysk-sys/frysk/sys/Execute.java
index 6d6b3db..1562dab 100644
--- a/frysk-sys/frysk/sys/Execute.java
+++ b/frysk-sys/frysk/sys/Execute.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/FileDescriptor.java b/frysk-sys/frysk/sys/FileDescriptor.java
index 3cc0ed7..1c2c942 100644
--- a/frysk-sys/frysk/sys/FileDescriptor.java
+++ b/frysk-sys/frysk/sys/FileDescriptor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Fork.java b/frysk-sys/frysk/sys/Fork.java
index 46c98cb..9e55640 100644
--- a/frysk-sys/frysk/sys/Fork.java
+++ b/frysk-sys/frysk/sys/Fork.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/GarbageCollect.java b/frysk-sys/frysk/sys/GarbageCollect.java
index 721ffc2..c08fec3 100644
--- a/frysk-sys/frysk/sys/GarbageCollect.java
+++ b/frysk-sys/frysk/sys/GarbageCollect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Itimer.java b/frysk-sys/frysk/sys/Itimer.java
index 6ab41ed..d811b10 100644
--- a/frysk-sys/frysk/sys/Itimer.java
+++ b/frysk-sys/frysk/sys/Itimer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Pid.java b/frysk-sys/frysk/sys/Pid.java
index 5c92271..bc8c8db 100644
--- a/frysk-sys/frysk/sys/Pid.java
+++ b/frysk-sys/frysk/sys/Pid.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Pipe.java b/frysk-sys/frysk/sys/Pipe.java
index bd88db4..9b28315 100644
--- a/frysk-sys/frysk/sys/Pipe.java
+++ b/frysk-sys/frysk/sys/Pipe.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/PipePair.java b/frysk-sys/frysk/sys/PipePair.java
index c150f02..df653d6 100644
--- a/frysk-sys/frysk/sys/PipePair.java
+++ b/frysk-sys/frysk/sys/PipePair.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ProcessIdentifier.java b/frysk-sys/frysk/sys/ProcessIdentifier.java
index 6e76b8f..52fbab1 100644
--- a/frysk-sys/frysk/sys/ProcessIdentifier.java
+++ b/frysk-sys/frysk/sys/ProcessIdentifier.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ProcessIdentifierDecorator.java b/frysk-sys/frysk/sys/ProcessIdentifierDecorator.java
index f1d3418..fc05098 100644
--- a/frysk-sys/frysk/sys/ProcessIdentifierDecorator.java
+++ b/frysk-sys/frysk/sys/ProcessIdentifierDecorator.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ProcessIdentifierFactory.java b/frysk-sys/frysk/sys/ProcessIdentifierFactory.java
index dccb2d4..05e82c0 100644
--- a/frysk-sys/frysk/sys/ProcessIdentifierFactory.java
+++ b/frysk-sys/frysk/sys/ProcessIdentifierFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/PseudoTerminal.java b/frysk-sys/frysk/sys/PseudoTerminal.java
index 8f3262d..bf0c019 100755
--- a/frysk-sys/frysk/sys/PseudoTerminal.java
+++ b/frysk-sys/frysk/sys/PseudoTerminal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Redirect.java b/frysk-sys/frysk/sys/Redirect.java
index 9d44921..de98cea 100644
--- a/frysk-sys/frysk/sys/Redirect.java
+++ b/frysk-sys/frysk/sys/Redirect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Signal.java-sh b/frysk-sys/frysk/sys/Signal.java-sh
index 3d3c4b4..c38d045 100644
--- a/frysk-sys/frysk/sys/Signal.java-sh
+++ b/frysk-sys/frysk/sys/Signal.java-sh
@@ -14,8 +14,7 @@ cat <<EOF
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/SignalBuilder.java b/frysk-sys/frysk/sys/SignalBuilder.java
index f30a68a..50711e8 100644
--- a/frysk-sys/frysk/sys/SignalBuilder.java
+++ b/frysk-sys/frysk/sys/SignalBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/SignalSet.java b/frysk-sys/frysk/sys/SignalSet.java
index 519a921..5f80f98 100644
--- a/frysk-sys/frysk/sys/SignalSet.java
+++ b/frysk-sys/frysk/sys/SignalSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Size.java b/frysk-sys/frysk/sys/Size.java
index 7b950e0..bec5939 100644
--- a/frysk-sys/frysk/sys/Size.java
+++ b/frysk-sys/frysk/sys/Size.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/StatelessFile.java b/frysk-sys/frysk/sys/StatelessFile.java
index 3537edd..12ee1c1 100644
--- a/frysk-sys/frysk/sys/StatelessFile.java
+++ b/frysk-sys/frysk/sys/StatelessFile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestEnviron.java b/frysk-sys/frysk/sys/TestEnviron.java
index 1c32091..13589da 100644
--- a/frysk-sys/frysk/sys/TestEnviron.java
+++ b/frysk-sys/frysk/sys/TestEnviron.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestFileDescriptor.java b/frysk-sys/frysk/sys/TestFileDescriptor.java
index c08bfbb..2fe1ac9 100644
--- a/frysk-sys/frysk/sys/TestFileDescriptor.java
+++ b/frysk-sys/frysk/sys/TestFileDescriptor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestFork.java b/frysk-sys/frysk/sys/TestFork.java
index 82ba7a9..eaf1fe6 100644
--- a/frysk-sys/frysk/sys/TestFork.java
+++ b/frysk-sys/frysk/sys/TestFork.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestGarbageCollect.java b/frysk-sys/frysk/sys/TestGarbageCollect.java
index d37f597..ffac8af 100644
--- a/frysk-sys/frysk/sys/TestGarbageCollect.java
+++ b/frysk-sys/frysk/sys/TestGarbageCollect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestLeakingFileDescriptor.java b/frysk-sys/frysk/sys/TestLeakingFileDescriptor.java
index dbef826..b2cf585 100644
--- a/frysk-sys/frysk/sys/TestLeakingFileDescriptor.java
+++ b/frysk-sys/frysk/sys/TestLeakingFileDescriptor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestPipePair.java b/frysk-sys/frysk/sys/TestPipePair.java
index 4b182e6..b8eb983 100644
--- a/frysk-sys/frysk/sys/TestPipePair.java
+++ b/frysk-sys/frysk/sys/TestPipePair.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestProcessIdentifier.java b/frysk-sys/frysk/sys/TestProcessIdentifier.java
index 44c6daa..0fb4eed 100644
--- a/frysk-sys/frysk/sys/TestProcessIdentifier.java
+++ b/frysk-sys/frysk/sys/TestProcessIdentifier.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestPseudoTerminal.java b/frysk-sys/frysk/sys/TestPseudoTerminal.java
index 5f3e371..d4af317 100644
--- a/frysk-sys/frysk/sys/TestPseudoTerminal.java
+++ b/frysk-sys/frysk/sys/TestPseudoTerminal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestSignal.java b/frysk-sys/frysk/sys/TestSignal.java
index 1414566..5ccc3a2 100644
--- a/frysk-sys/frysk/sys/TestSignal.java
+++ b/frysk-sys/frysk/sys/TestSignal.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestSignalSet.java b/frysk-sys/frysk/sys/TestSignalSet.java
index ba0607b..c1881da 100644
--- a/frysk-sys/frysk/sys/TestSignalSet.java
+++ b/frysk-sys/frysk/sys/TestSignalSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestStatelessFile.java b/frysk-sys/frysk/sys/TestStatelessFile.java
index 3336081..019ca0d 100644
--- a/frysk-sys/frysk/sys/TestStatelessFile.java
+++ b/frysk-sys/frysk/sys/TestStatelessFile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/TestWait.java b/frysk-sys/frysk/sys/TestWait.java
index a32a652..1f755b8 100644
--- a/frysk-sys/frysk/sys/TestWait.java
+++ b/frysk-sys/frysk/sys/TestWait.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Tid.java b/frysk-sys/frysk/sys/Tid.java
index c8a9bce..b76f688 100644
--- a/frysk-sys/frysk/sys/Tid.java
+++ b/frysk-sys/frysk/sys/Tid.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Uname.java b/frysk-sys/frysk/sys/Uname.java
index d5c8e02..9e607f2 100644
--- a/frysk-sys/frysk/sys/Uname.java
+++ b/frysk-sys/frysk/sys/Uname.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/UnhandledWaitBuilder.java b/frysk-sys/frysk/sys/UnhandledWaitBuilder.java
index b567d8f..c0c50bb 100644
--- a/frysk-sys/frysk/sys/UnhandledWaitBuilder.java
+++ b/frysk-sys/frysk/sys/UnhandledWaitBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/Wait.java b/frysk-sys/frysk/sys/Wait.java
index a41038a..e660ba2 100644
--- a/frysk-sys/frysk/sys/Wait.java
+++ b/frysk-sys/frysk/sys/Wait.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/WaitBuilder.java b/frysk-sys/frysk/sys/WaitBuilder.java
index 5b8ed00..00294df 100644
--- a/frysk-sys/frysk/sys/WaitBuilder.java
+++ b/frysk-sys/frysk/sys/WaitBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/AuditLibs.cxx b/frysk-sys/frysk/sys/jni/AuditLibs.cxx
index fb0cda7..c349a75 100644
--- a/frysk-sys/frysk/sys/jni/AuditLibs.cxx
+++ b/frysk-sys/frysk/sys/jni/AuditLibs.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Environ.cxx b/frysk-sys/frysk/sys/jni/Environ.cxx
index 08ac88c..dbbd927 100644
--- a/frysk-sys/frysk/sys/jni/Environ.cxx
+++ b/frysk-sys/frysk/sys/jni/Environ.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/FileDescriptor.cxx b/frysk-sys/frysk/sys/jni/FileDescriptor.cxx
index b831562..010d349 100644
--- a/frysk-sys/frysk/sys/jni/FileDescriptor.cxx
+++ b/frysk-sys/frysk/sys/jni/FileDescriptor.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Fork.cxx b/frysk-sys/frysk/sys/jni/Fork.cxx
index bb1549b..8478eae 100644
--- a/frysk-sys/frysk/sys/jni/Fork.cxx
+++ b/frysk-sys/frysk/sys/jni/Fork.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Fork.hxx b/frysk-sys/frysk/sys/jni/Fork.hxx
index 6bf9dd1..93f595d 100644
--- a/frysk-sys/frysk/sys/jni/Fork.hxx
+++ b/frysk-sys/frysk/sys/jni/Fork.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Itimer.cxx b/frysk-sys/frysk/sys/jni/Itimer.cxx
index 88ba5a2..277b16b 100644
--- a/frysk-sys/frysk/sys/jni/Itimer.cxx
+++ b/frysk-sys/frysk/sys/jni/Itimer.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Pid.cxx b/frysk-sys/frysk/sys/jni/Pid.cxx
index a5cf5b5..5677aeb 100644
--- a/frysk-sys/frysk/sys/jni/Pid.cxx
+++ b/frysk-sys/frysk/sys/jni/Pid.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Pipe.cxx b/frysk-sys/frysk/sys/jni/Pipe.cxx
index 4b94701..a7403b5 100644
--- a/frysk-sys/frysk/sys/jni/Pipe.cxx
+++ b/frysk-sys/frysk/sys/jni/Pipe.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/PipePair.cxx b/frysk-sys/frysk/sys/jni/PipePair.cxx
index d3eb91d..9297eeb 100644
--- a/frysk-sys/frysk/sys/jni/PipePair.cxx
+++ b/frysk-sys/frysk/sys/jni/PipePair.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx b/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx
index 153a6b9..aa6caa1 100644
--- a/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx
+++ b/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Signal.cxx-sh b/frysk-sys/frysk/sys/jni/Signal.cxx-sh
index cd03ccd..b557d8f 100644
--- a/frysk-sys/frysk/sys/jni/Signal.cxx-sh
+++ b/frysk-sys/frysk/sys/jni/Signal.cxx-sh
@@ -14,8 +14,7 @@ cat <<EOF
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/SignalSet.cxx b/frysk-sys/frysk/sys/jni/SignalSet.cxx
index 217ccf8..77a0b30 100644
--- a/frysk-sys/frysk/sys/jni/SignalSet.cxx
+++ b/frysk-sys/frysk/sys/jni/SignalSet.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/SignalSet.hxx b/frysk-sys/frysk/sys/jni/SignalSet.hxx
index e34b073..a050a79 100644
--- a/frysk-sys/frysk/sys/jni/SignalSet.hxx
+++ b/frysk-sys/frysk/sys/jni/SignalSet.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/StatelessFile.cxx b/frysk-sys/frysk/sys/jni/StatelessFile.cxx
index d2dc7b0..7b2826a 100644
--- a/frysk-sys/frysk/sys/jni/StatelessFile.cxx
+++ b/frysk-sys/frysk/sys/jni/StatelessFile.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Tid.cxx b/frysk-sys/frysk/sys/jni/Tid.cxx
index 29ace37..41036f6 100644
--- a/frysk-sys/frysk/sys/jni/Tid.cxx
+++ b/frysk-sys/frysk/sys/jni/Tid.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Uname.cxx b/frysk-sys/frysk/sys/jni/Uname.cxx
index e1a4f3f..c69492c 100644
--- a/frysk-sys/frysk/sys/jni/Uname.cxx
+++ b/frysk-sys/frysk/sys/jni/Uname.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/jni/Wait.cxx b/frysk-sys/frysk/sys/jni/Wait.cxx
index 8d6fb22..1cbcc98 100644
--- a/frysk-sys/frysk/sys/jni/Wait.cxx
+++ b/frysk-sys/frysk/sys/jni/Wait.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/poll/Poll.java b/frysk-sys/frysk/sys/poll/Poll.java
index bef9c0a..5ce4c51d 100644
--- a/frysk-sys/frysk/sys/poll/Poll.java
+++ b/frysk-sys/frysk/sys/poll/Poll.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/poll/PollBuilder.java b/frysk-sys/frysk/sys/poll/PollBuilder.java
index d3f6c3d..ce30614 100644
--- a/frysk-sys/frysk/sys/poll/PollBuilder.java
+++ b/frysk-sys/frysk/sys/poll/PollBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/poll/PollFileDescriptors.java b/frysk-sys/frysk/sys/poll/PollFileDescriptors.java
index 0f1380e..bd93758 100644
--- a/frysk-sys/frysk/sys/poll/PollFileDescriptors.java
+++ b/frysk-sys/frysk/sys/poll/PollFileDescriptors.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/poll/jni/Poll.cxx b/frysk-sys/frysk/sys/poll/jni/Poll.cxx
index 85950c0..480b9a5 100644
--- a/frysk-sys/frysk/sys/poll/jni/Poll.cxx
+++ b/frysk-sys/frysk/sys/poll/jni/Poll.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/poll/jni/PollFileDescriptors.cxx b/frysk-sys/frysk/sys/poll/jni/PollFileDescriptors.cxx
index 586d34c..198d1c7 100644
--- a/frysk-sys/frysk/sys/poll/jni/PollFileDescriptors.cxx
+++ b/frysk-sys/frysk/sys/poll/jni/PollFileDescriptors.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/AuxvBuilder.java b/frysk-sys/frysk/sys/proc/AuxvBuilder.java
index fda5bb0..5d6274e 100644
--- a/frysk-sys/frysk/sys/proc/AuxvBuilder.java
+++ b/frysk-sys/frysk/sys/proc/AuxvBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/CmdLineBuilder.java b/frysk-sys/frysk/sys/proc/CmdLineBuilder.java
index 9869dbc..316732a 100644
--- a/frysk-sys/frysk/sys/proc/CmdLineBuilder.java
+++ b/frysk-sys/frysk/sys/proc/CmdLineBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/Exe.java b/frysk-sys/frysk/sys/proc/Exe.java
index 23e33be..827ad30 100644
--- a/frysk-sys/frysk/sys/proc/Exe.java
+++ b/frysk-sys/frysk/sys/proc/Exe.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/MapsBuilder.java b/frysk-sys/frysk/sys/proc/MapsBuilder.java
index 1880fca..2d7c53d 100644
--- a/frysk-sys/frysk/sys/proc/MapsBuilder.java
+++ b/frysk-sys/frysk/sys/proc/MapsBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/Mem.java b/frysk-sys/frysk/sys/proc/Mem.java
index bb4302a..68aaa39 100644
--- a/frysk-sys/frysk/sys/proc/Mem.java
+++ b/frysk-sys/frysk/sys/proc/Mem.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/ProcBuilder.java b/frysk-sys/frysk/sys/proc/ProcBuilder.java
index 0641dff..c215b5d 100644
--- a/frysk-sys/frysk/sys/proc/ProcBuilder.java
+++ b/frysk-sys/frysk/sys/proc/ProcBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/Stat.java b/frysk-sys/frysk/sys/proc/Stat.java
index d75da6b..0c57203 100644
--- a/frysk-sys/frysk/sys/proc/Stat.java
+++ b/frysk-sys/frysk/sys/proc/Stat.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/Status.java b/frysk-sys/frysk/sys/proc/Status.java
index 0590f4e..da8e159 100644
--- a/frysk-sys/frysk/sys/proc/Status.java
+++ b/frysk-sys/frysk/sys/proc/Status.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestAuxv.java b/frysk-sys/frysk/sys/proc/TestAuxv.java
index 33c81b9..ba6aadf 100644
--- a/frysk-sys/frysk/sys/proc/TestAuxv.java
+++ b/frysk-sys/frysk/sys/proc/TestAuxv.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestCmdLine.java b/frysk-sys/frysk/sys/proc/TestCmdLine.java
index a7f8a08..06693ee 100644
--- a/frysk-sys/frysk/sys/proc/TestCmdLine.java
+++ b/frysk-sys/frysk/sys/proc/TestCmdLine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestLib.java b/frysk-sys/frysk/sys/proc/TestLib.java
index 78ac909..3b2b9a7 100644
--- a/frysk-sys/frysk/sys/proc/TestLib.java
+++ b/frysk-sys/frysk/sys/proc/TestLib.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestMaps.java b/frysk-sys/frysk/sys/proc/TestMaps.java
index 611a45c..22f4690 100644
--- a/frysk-sys/frysk/sys/proc/TestMaps.java
+++ b/frysk-sys/frysk/sys/proc/TestMaps.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestProcBuilder.java b/frysk-sys/frysk/sys/proc/TestProcBuilder.java
index c01cf38..dc6dd76 100644
--- a/frysk-sys/frysk/sys/proc/TestProcBuilder.java
+++ b/frysk-sys/frysk/sys/proc/TestProcBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestStat.java b/frysk-sys/frysk/sys/proc/TestStat.java
index f57c0e2..1d5ce20 100644
--- a/frysk-sys/frysk/sys/proc/TestStat.java
+++ b/frysk-sys/frysk/sys/proc/TestStat.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/TestStatus.java b/frysk-sys/frysk/sys/proc/TestStatus.java
index e826c64..9c85ec5 100644
--- a/frysk-sys/frysk/sys/proc/TestStatus.java
+++ b/frysk-sys/frysk/sys/proc/TestStatus.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx
index ef013aa..0a1c19f 100644
--- a/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/AuxvBuilder.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx
index cb0b1ec..c96dcc1 100644
--- a/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/CmdLineBuilder.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/Exe.cxx b/frysk-sys/frysk/sys/proc/jni/Exe.cxx
index 162e56a..4d2624f 100644
--- a/frysk-sys/frysk/sys/proc/jni/Exe.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/Exe.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx
index 9309107..cbf5e0d 100644
--- a/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/MapsBuilder.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx
index 2cc52ae..6ca105d 100644
--- a/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/Stat.cxx b/frysk-sys/frysk/sys/proc/jni/Stat.cxx
index 57eb199..1b90874 100644
--- a/frysk-sys/frysk/sys/proc/jni/Stat.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/Stat.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/proc/jni/Status.cxx b/frysk-sys/frysk/sys/proc/jni/Status.cxx
index 8bcf600..d35f906 100644
--- a/frysk-sys/frysk/sys/proc/jni/Status.cxx
+++ b/frysk-sys/frysk/sys/proc/jni/Status.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/BlockSpace.java b/frysk-sys/frysk/sys/ptrace/BlockSpace.java
index 916fc1a..fadc8bc 100644
--- a/frysk-sys/frysk/sys/ptrace/BlockSpace.java
+++ b/frysk-sys/frysk/sys/ptrace/BlockSpace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/ByteSpace.java b/frysk-sys/frysk/sys/ptrace/ByteSpace.java
index e28b906..6d99b9a 100644
--- a/frysk-sys/frysk/sys/ptrace/ByteSpace.java
+++ b/frysk-sys/frysk/sys/ptrace/ByteSpace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/Ptrace.java b/frysk-sys/frysk/sys/ptrace/Ptrace.java
index aa5b3b8..6b9b287 100644
--- a/frysk-sys/frysk/sys/ptrace/Ptrace.java
+++ b/frysk-sys/frysk/sys/ptrace/Ptrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/TestAddressSpace.java b/frysk-sys/frysk/sys/ptrace/TestAddressSpace.java
index 05c9cb9..673de9d 100644
--- a/frysk-sys/frysk/sys/ptrace/TestAddressSpace.java
+++ b/frysk-sys/frysk/sys/ptrace/TestAddressSpace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/TestPtrace.java b/frysk-sys/frysk/sys/ptrace/TestPtrace.java
index 4cf2ad9..29c6c7d 100644
--- a/frysk-sys/frysk/sys/ptrace/TestPtrace.java
+++ b/frysk-sys/frysk/sys/ptrace/TestPtrace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/TestRegisterSet.java b/frysk-sys/frysk/sys/ptrace/TestRegisterSet.java
index df351bb..31850da 100644
--- a/frysk-sys/frysk/sys/ptrace/TestRegisterSet.java
+++ b/frysk-sys/frysk/sys/ptrace/TestRegisterSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/jni/BlockSpace.cxx b/frysk-sys/frysk/sys/ptrace/jni/BlockSpace.cxx
index 00f54e8..d06e181 100644
--- a/frysk-sys/frysk/sys/ptrace/jni/BlockSpace.cxx
+++ b/frysk-sys/frysk/sys/ptrace/jni/BlockSpace.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/jni/ByteSpace.cxx b/frysk-sys/frysk/sys/ptrace/jni/ByteSpace.cxx
index 0fa5fe3..6ca011f 100644
--- a/frysk-sys/frysk/sys/ptrace/jni/ByteSpace.cxx
+++ b/frysk-sys/frysk/sys/ptrace/jni/ByteSpace.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx b/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx
index dce86e5..949d343 100644
--- a/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx
+++ b/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/ptrace/jni/Ptrace.hxx b/frysk-sys/frysk/sys/ptrace/jni/Ptrace.hxx
index 46e2edd..736dfd7 100644
--- a/frysk-sys/frysk/sys/ptrace/jni/Ptrace.hxx
+++ b/frysk-sys/frysk/sys/ptrace/jni/Ptrace.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Action.java b/frysk-sys/frysk/sys/termios/Action.java
index 874e034..d369060 100644
--- a/frysk-sys/frysk/sys/termios/Action.java
+++ b/frysk-sys/frysk/sys/termios/Action.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Control.java b/frysk-sys/frysk/sys/termios/Control.java
index 663a344..d9c1f6e 100644
--- a/frysk-sys/frysk/sys/termios/Control.java
+++ b/frysk-sys/frysk/sys/termios/Control.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Flow.java b/frysk-sys/frysk/sys/termios/Flow.java
index 762fada..25e16ee 100644
--- a/frysk-sys/frysk/sys/termios/Flow.java
+++ b/frysk-sys/frysk/sys/termios/Flow.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Flush.java b/frysk-sys/frysk/sys/termios/Flush.java
index 68a96d7..e03c6c2 100644
--- a/frysk-sys/frysk/sys/termios/Flush.java
+++ b/frysk-sys/frysk/sys/termios/Flush.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Input.java b/frysk-sys/frysk/sys/termios/Input.java
index e2ada47..a3d0662 100644
--- a/frysk-sys/frysk/sys/termios/Input.java
+++ b/frysk-sys/frysk/sys/termios/Input.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Local.java b/frysk-sys/frysk/sys/termios/Local.java
index 5193d2f..49dde45 100644
--- a/frysk-sys/frysk/sys/termios/Local.java
+++ b/frysk-sys/frysk/sys/termios/Local.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Mode.java b/frysk-sys/frysk/sys/termios/Mode.java
index 194de4c..949fed4 100644
--- a/frysk-sys/frysk/sys/termios/Mode.java
+++ b/frysk-sys/frysk/sys/termios/Mode.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Output.java b/frysk-sys/frysk/sys/termios/Output.java
index b0bb645..c9e2e34 100644
--- a/frysk-sys/frysk/sys/termios/Output.java
+++ b/frysk-sys/frysk/sys/termios/Output.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Special.java b/frysk-sys/frysk/sys/termios/Special.java
index 9222426..4c91833 100644
--- a/frysk-sys/frysk/sys/termios/Special.java
+++ b/frysk-sys/frysk/sys/termios/Special.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Speed.java b/frysk-sys/frysk/sys/termios/Speed.java
index a9ab62d..aee5465 100644
--- a/frysk-sys/frysk/sys/termios/Speed.java
+++ b/frysk-sys/frysk/sys/termios/Speed.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/Termios.java b/frysk-sys/frysk/sys/termios/Termios.java
index af3898f..ba12f2d 100644
--- a/frysk-sys/frysk/sys/termios/Termios.java
+++ b/frysk-sys/frysk/sys/termios/Termios.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/TestLib.java b/frysk-sys/frysk/sys/termios/TestLib.java
index afd6384..44d9053 100644
--- a/frysk-sys/frysk/sys/termios/TestLib.java
+++ b/frysk-sys/frysk/sys/termios/TestLib.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/TestMode.java b/frysk-sys/frysk/sys/termios/TestMode.java
index 8167e1a..a5a7d93 100644
--- a/frysk-sys/frysk/sys/termios/TestMode.java
+++ b/frysk-sys/frysk/sys/termios/TestMode.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/TestSpecial.java b/frysk-sys/frysk/sys/termios/TestSpecial.java
index 9ce6245..d04d10c 100644
--- a/frysk-sys/frysk/sys/termios/TestSpecial.java
+++ b/frysk-sys/frysk/sys/termios/TestSpecial.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/TestSpeed.java b/frysk-sys/frysk/sys/termios/TestSpeed.java
index 4f298db..abb2d51 100644
--- a/frysk-sys/frysk/sys/termios/TestSpeed.java
+++ b/frysk-sys/frysk/sys/termios/TestSpeed.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/TestTermios.java b/frysk-sys/frysk/sys/termios/TestTermios.java
index 5e44318..a60b39a 100644
--- a/frysk-sys/frysk/sys/termios/TestTermios.java
+++ b/frysk-sys/frysk/sys/termios/TestTermios.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Control.cxx b/frysk-sys/frysk/sys/termios/jni/Control.cxx
index d5f303f..6a7c251 100644
--- a/frysk-sys/frysk/sys/termios/jni/Control.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Control.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Flow.cxx b/frysk-sys/frysk/sys/termios/jni/Flow.cxx
index 0556a9a..afbe154 100644
--- a/frysk-sys/frysk/sys/termios/jni/Flow.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Flow.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Flush.cxx b/frysk-sys/frysk/sys/termios/jni/Flush.cxx
index d8cefe3..772dc5b 100644
--- a/frysk-sys/frysk/sys/termios/jni/Flush.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Flush.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Input.cxx b/frysk-sys/frysk/sys/termios/jni/Input.cxx
index 07c97a9..81132c6 100644
--- a/frysk-sys/frysk/sys/termios/jni/Input.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Input.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Local.cxx b/frysk-sys/frysk/sys/termios/jni/Local.cxx
index 4b996df..7abd8ab 100644
--- a/frysk-sys/frysk/sys/termios/jni/Local.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Local.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Output.cxx b/frysk-sys/frysk/sys/termios/jni/Output.cxx
index c5cf839..e608b5f 100644
--- a/frysk-sys/frysk/sys/termios/jni/Output.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Output.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Special.cxx b/frysk-sys/frysk/sys/termios/jni/Special.cxx
index 8d6afc1..721f54e 100644
--- a/frysk-sys/frysk/sys/termios/jni/Special.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Special.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Speed.cxx b/frysk-sys/frysk/sys/termios/jni/Speed.cxx
index 513cc28..678a64d 100644
--- a/frysk-sys/frysk/sys/termios/jni/Speed.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Speed.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/sys/termios/jni/Termios.cxx b/frysk-sys/frysk/sys/termios/jni/Termios.cxx
index 6c0f472..f99768f 100644
--- a/frysk-sys/frysk/sys/termios/jni/Termios.cxx
+++ b/frysk-sys/frysk/sys/termios/jni/Termios.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/ForkFactory.java b/frysk-sys/frysk/testbed/ForkFactory.java
index e42f50c..b33568a 100644
--- a/frysk-sys/frysk/testbed/ForkFactory.java
+++ b/frysk-sys/frysk/testbed/ForkFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/LocalMemory.java b/frysk-sys/frysk/testbed/LocalMemory.java
index c9ff821..a756d16 100644
--- a/frysk-sys/frysk/testbed/LocalMemory.java
+++ b/frysk-sys/frysk/testbed/LocalMemory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TearDownExpect.java b/frysk-sys/frysk/testbed/TearDownExpect.java
index 7bbdcfb..ee7b7bc 100644
--- a/frysk-sys/frysk/testbed/TearDownExpect.java
+++ b/frysk-sys/frysk/testbed/TearDownExpect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TearDownFile.java b/frysk-sys/frysk/testbed/TearDownFile.java
index 2e266c3..46a0f9c 100644
--- a/frysk-sys/frysk/testbed/TearDownFile.java
+++ b/frysk-sys/frysk/testbed/TearDownFile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TearDownProcess.java b/frysk-sys/frysk/testbed/TearDownProcess.java
index f13d1d6..c9483fb 100644
--- a/frysk-sys/frysk/testbed/TearDownProcess.java
+++ b/frysk-sys/frysk/testbed/TearDownProcess.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TestForkFactory.java b/frysk-sys/frysk/testbed/TestForkFactory.java
index f71407e..920aa63 100644
--- a/frysk-sys/frysk/testbed/TestForkFactory.java
+++ b/frysk-sys/frysk/testbed/TestForkFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TestLocalMemory.java b/frysk-sys/frysk/testbed/TestLocalMemory.java
index 4d4447c..911e938 100644
--- a/frysk-sys/frysk/testbed/TestLocalMemory.java
+++ b/frysk-sys/frysk/testbed/TestLocalMemory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TestTearDownExpect.java b/frysk-sys/frysk/testbed/TestTearDownExpect.java
index b76ee78..08a7bfb 100644
--- a/frysk-sys/frysk/testbed/TestTearDownExpect.java
+++ b/frysk-sys/frysk/testbed/TestTearDownExpect.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TestTearDownFile.java b/frysk-sys/frysk/testbed/TestTearDownFile.java
index eb82dd2..58bfa4a 100644
--- a/frysk-sys/frysk/testbed/TestTearDownFile.java
+++ b/frysk-sys/frysk/testbed/TestTearDownFile.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/TestTearDownProcess.java b/frysk-sys/frysk/testbed/TestTearDownProcess.java
index f713305..2ab99b7 100644
--- a/frysk-sys/frysk/testbed/TestTearDownProcess.java
+++ b/frysk-sys/frysk/testbed/TestTearDownProcess.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/jni/ForkFactory.cxx b/frysk-sys/frysk/testbed/jni/ForkFactory.cxx
index 034c596..dd3ba77 100644
--- a/frysk-sys/frysk/testbed/jni/ForkFactory.cxx
+++ b/frysk-sys/frysk/testbed/jni/ForkFactory.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx
index 9324cf2..4cfd9a8 100644
--- a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx
+++ b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/inua/eio/ArrayByteBuffer.java b/frysk-sys/inua/eio/ArrayByteBuffer.java
index fe4c752..2d07a5a 100644
--- a/frysk-sys/inua/eio/ArrayByteBuffer.java
+++ b/frysk-sys/inua/eio/ArrayByteBuffer.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/Buffer.java b/frysk-sys/inua/eio/Buffer.java
index 94fc0c0..f013b33 100644
--- a/frysk-sys/inua/eio/Buffer.java
+++ b/frysk-sys/inua/eio/Buffer.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/BufferOverflowException.java b/frysk-sys/inua/eio/BufferOverflowException.java
index 14943a8..806bf2f 100644
--- a/frysk-sys/inua/eio/BufferOverflowException.java
+++ b/frysk-sys/inua/eio/BufferOverflowException.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/BufferUnderflowException.java b/frysk-sys/inua/eio/BufferUnderflowException.java
index 2f9f7ed..8969ec2 100644
--- a/frysk-sys/inua/eio/BufferUnderflowException.java
+++ b/frysk-sys/inua/eio/BufferUnderflowException.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/ByteBuffer.java b/frysk-sys/inua/eio/ByteBuffer.java
index 873e481..e7c5c83 100644
--- a/frysk-sys/inua/eio/ByteBuffer.java
+++ b/frysk-sys/inua/eio/ByteBuffer.java
@@ -11,8 +11,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/ByteFileBuffer.java b/frysk-sys/inua/eio/ByteFileBuffer.java
index 2a96738..0acfb18 100644
--- a/frysk-sys/inua/eio/ByteFileBuffer.java
+++ b/frysk-sys/inua/eio/ByteFileBuffer.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/ByteOrder.java b/frysk-sys/inua/eio/ByteOrder.java
index 41081fd..84a33bc 100644
--- a/frysk-sys/inua/eio/ByteOrder.java
+++ b/frysk-sys/inua/eio/ByteOrder.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/ByteOrdered.java b/frysk-sys/inua/eio/ByteOrdered.java
index 384446b..b841f29 100644
--- a/frysk-sys/inua/eio/ByteOrdered.java
+++ b/frysk-sys/inua/eio/ByteOrdered.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/Ctring.java b/frysk-sys/inua/eio/Ctring.java
index 86f8b29..8c22da9 100644
--- a/frysk-sys/inua/eio/Ctring.java
+++ b/frysk-sys/inua/eio/Ctring.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/ReaderByteBuffer.java b/frysk-sys/inua/eio/ReaderByteBuffer.java
index 3163a84..a0b54be 100644
--- a/frysk-sys/inua/eio/ReaderByteBuffer.java
+++ b/frysk-sys/inua/eio/ReaderByteBuffer.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/TestByteBuffer.java b/frysk-sys/inua/eio/TestByteBuffer.java
index cde2826..e095962 100644
--- a/frysk-sys/inua/eio/TestByteBuffer.java
+++ b/frysk-sys/inua/eio/TestByteBuffer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/inua/eio/TestGet.java b/frysk-sys/inua/eio/TestGet.java
index f5377ed..9e76d69 100644
--- a/frysk-sys/inua/eio/TestGet.java
+++ b/frysk-sys/inua/eio/TestGet.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/TestLib.java b/frysk-sys/inua/eio/TestLib.java
index 9f74105..bc338f4 100644
--- a/frysk-sys/inua/eio/TestLib.java
+++ b/frysk-sys/inua/eio/TestLib.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/TestPut.java b/frysk-sys/inua/eio/TestPut.java
index 0db4b58..8e63832 100644
--- a/frysk-sys/inua/eio/TestPut.java
+++ b/frysk-sys/inua/eio/TestPut.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/TestWordSize.java b/frysk-sys/inua/eio/TestWordSize.java
index 982d80f..da20bbc 100644
--- a/frysk-sys/inua/eio/TestWordSize.java
+++ b/frysk-sys/inua/eio/TestWordSize.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/ULong.java b/frysk-sys/inua/eio/ULong.java
index 52a4525..48ff3d0 100644
--- a/frysk-sys/inua/eio/ULong.java
+++ b/frysk-sys/inua/eio/ULong.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/eio/WordSized.java b/frysk-sys/inua/eio/WordSized.java
index f709643..401830d 100644
--- a/frysk-sys/inua/eio/WordSized.java
+++ b/frysk-sys/inua/eio/WordSized.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/Mask.java b/frysk-sys/inua/util/Mask.java
index 2790a6d..eb48148 100644
--- a/frysk-sys/inua/util/Mask.java
+++ b/frysk-sys/inua/util/Mask.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/Misc.java b/frysk-sys/inua/util/Misc.java
index ea278cf..f5602c3 100644
--- a/frysk-sys/inua/util/Misc.java
+++ b/frysk-sys/inua/util/Misc.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/Pool.java b/frysk-sys/inua/util/Pool.java
index 607af25..a489386 100644
--- a/frysk-sys/inua/util/Pool.java
+++ b/frysk-sys/inua/util/Pool.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/Print.java b/frysk-sys/inua/util/Print.java
index c4f6617..33e4f50 100644
--- a/frysk-sys/inua/util/Print.java
+++ b/frysk-sys/inua/util/Print.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/PrintWriter.java b/frysk-sys/inua/util/PrintWriter.java
index 9e65aa5..4b8f3e5 100644
--- a/frysk-sys/inua/util/PrintWriter.java
+++ b/frysk-sys/inua/util/PrintWriter.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/Scanner.java b/frysk-sys/inua/util/Scanner.java
index a810826..04b2af7 100644
--- a/frysk-sys/inua/util/Scanner.java
+++ b/frysk-sys/inua/util/Scanner.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/TestPool.java b/frysk-sys/inua/util/TestPool.java
index c82bc92..f623aed 100644
--- a/frysk-sys/inua/util/TestPool.java
+++ b/frysk-sys/inua/util/TestPool.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/addr2line.java b/frysk-sys/inua/util/addr2line.java
index 9647533..8f5b6aa 100644
--- a/frysk-sys/inua/util/addr2line.java
+++ b/frysk-sys/inua/util/addr2line.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/inua/util/line2addr.java b/frysk-sys/inua/util/line2addr.java
index 735c3fa..db521d2 100644
--- a/frysk-sys/inua/util/line2addr.java
+++ b/frysk-sys/inua/util/line2addr.java
@@ -10,8 +10,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with INUA; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with INUA.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Andrew Cagney. gives You the
 // additional right to link the code of INUA with code not covered
diff --git a/frysk-sys/jnixx/ClassVisitor.java b/frysk-sys/jnixx/ClassVisitor.java
index e3cdbf6..b2cafaa 100644
--- a/frysk-sys/jnixx/ClassVisitor.java
+++ b/frysk-sys/jnixx/ClassVisitor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/ClassWalker.java b/frysk-sys/jnixx/ClassWalker.java
index cf64c8a..45ed0dd 100644
--- a/frysk-sys/jnixx/ClassWalker.java
+++ b/frysk-sys/jnixx/ClassWalker.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/JniBindings.java b/frysk-sys/jnixx/JniBindings.java
index 49a594e..b7557a6 100644
--- a/frysk-sys/jnixx/JniBindings.java
+++ b/frysk-sys/jnixx/JniBindings.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/Main.java b/frysk-sys/jnixx/Main.java
index a9940d5..d68bd1a 100644
--- a/frysk-sys/jnixx/Main.java
+++ b/frysk-sys/jnixx/Main.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/Native.java b/frysk-sys/jnixx/Native.java
index 9cbdd54..79a092c 100644
--- a/frysk-sys/jnixx/Native.java
+++ b/frysk-sys/jnixx/Native.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/PrintCxxDefinitions.java b/frysk-sys/jnixx/PrintCxxDefinitions.java
index ae5af0e..032f100 100644
--- a/frysk-sys/jnixx/PrintCxxDefinitions.java
+++ b/frysk-sys/jnixx/PrintCxxDefinitions.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/PrintDeclarations.java b/frysk-sys/jnixx/PrintDeclarations.java
index bd74e92..db0117d 100644
--- a/frysk-sys/jnixx/PrintDeclarations.java
+++ b/frysk-sys/jnixx/PrintDeclarations.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/PrintHxxDefinitions.java b/frysk-sys/jnixx/PrintHxxDefinitions.java
index 191bef7..3ac6445 100644
--- a/frysk-sys/jnixx/PrintHxxDefinitions.java
+++ b/frysk-sys/jnixx/PrintHxxDefinitions.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/PrintNamespaces.java b/frysk-sys/jnixx/PrintNamespaces.java
index 7208fcd..e566c5f 100644
--- a/frysk-sys/jnixx/PrintNamespaces.java
+++ b/frysk-sys/jnixx/PrintNamespaces.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/Printer.java b/frysk-sys/jnixx/Printer.java
index dcd130f..c1d3bf6 100644
--- a/frysk-sys/jnixx/Printer.java
+++ b/frysk-sys/jnixx/Printer.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/TestJnixx.java b/frysk-sys/jnixx/TestJnixx.java
index b99b02f..1cb7182 100644
--- a/frysk-sys/jnixx/TestJnixx.java
+++ b/frysk-sys/jnixx/TestJnixx.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/bounds.hxx b/frysk-sys/jnixx/bounds.hxx
index 01aa4b7..e115238 100644
--- a/frysk-sys/jnixx/bounds.hxx
+++ b/frysk-sys/jnixx/bounds.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/elements.cxx b/frysk-sys/jnixx/elements.cxx
index 4200f2f..ef8f813 100644
--- a/frysk-sys/jnixx/elements.cxx
+++ b/frysk-sys/jnixx/elements.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/elements.hxx b/frysk-sys/jnixx/elements.hxx
index c61103c..7356b18 100644
--- a/frysk-sys/jnixx/elements.hxx
+++ b/frysk-sys/jnixx/elements.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/exceptions.cxx b/frysk-sys/jnixx/exceptions.cxx
index 928e0fd..b2039b3 100644
--- a/frysk-sys/jnixx/exceptions.cxx
+++ b/frysk-sys/jnixx/exceptions.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/exceptions.hxx b/frysk-sys/jnixx/exceptions.hxx
index 36fde6f..0376a80 100644
--- a/frysk-sys/jnixx/exceptions.hxx
+++ b/frysk-sys/jnixx/exceptions.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/jni/Native.cxx b/frysk-sys/jnixx/jni/Native.cxx
index 646aee4..5d6f2ff 100644
--- a/frysk-sys/jnixx/jni/Native.cxx
+++ b/frysk-sys/jnixx/jni/Native.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/jnixx.hxx b/frysk-sys/jnixx/jnixx.hxx
index aef95bb..b3e8ccd 100644
--- a/frysk-sys/jnixx/jnixx.hxx
+++ b/frysk-sys/jnixx/jnixx.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/logging.cxx b/frysk-sys/jnixx/logging.cxx
index 1d6fa00..0588059 100644
--- a/frysk-sys/jnixx/logging.cxx
+++ b/frysk-sys/jnixx/logging.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/logging.hxx b/frysk-sys/jnixx/logging.hxx
index 0729e17..af35f0c 100644
--- a/frysk-sys/jnixx/logging.hxx
+++ b/frysk-sys/jnixx/logging.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/print.cxx b/frysk-sys/jnixx/print.cxx
index 7653f97..568d10f 100644
--- a/frysk-sys/jnixx/print.cxx
+++ b/frysk-sys/jnixx/print.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/print.hxx b/frysk-sys/jnixx/print.hxx
index 2ccb731..7358e25 100644
--- a/frysk-sys/jnixx/print.hxx
+++ b/frysk-sys/jnixx/print.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/scan.cxx b/frysk-sys/jnixx/scan.cxx
index 29b8700..ef37606 100644
--- a/frysk-sys/jnixx/scan.cxx
+++ b/frysk-sys/jnixx/scan.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/jnixx/scan.hxx b/frysk-sys/jnixx/scan.hxx
index c2e8db5..83988b3 100644
--- a/frysk-sys/jnixx/scan.hxx
+++ b/frysk-sys/jnixx/scan.hxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/Disassembler.java b/frysk-sys/lib/dwfl/Disassembler.java
index fc49753..472fa22 100644
--- a/frysk-sys/lib/dwfl/Disassembler.java
+++ b/frysk-sys/lib/dwfl/Disassembler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwAccess.shenum b/frysk-sys/lib/dwfl/DwAccess.shenum
index 734a5ce..6badac5 100644
--- a/frysk-sys/lib/dwfl/DwAccess.shenum
+++ b/frysk-sys/lib/dwfl/DwAccess.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwAt.shenum b/frysk-sys/lib/dwfl/DwAt.shenum
index 87d9124..a9f47b0 100644
--- a/frysk-sys/lib/dwfl/DwAt.shenum
+++ b/frysk-sys/lib/dwfl/DwAt.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwAte.shenum b/frysk-sys/lib/dwfl/DwAte.shenum
index a22f143..6651580 100644
--- a/frysk-sys/lib/dwfl/DwAte.shenum
+++ b/frysk-sys/lib/dwfl/DwAte.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwAttributeNotFoundException.java b/frysk-sys/lib/dwfl/DwAttributeNotFoundException.java
index 86d03e5..4d04b1c 100644
--- a/frysk-sys/lib/dwfl/DwAttributeNotFoundException.java
+++ b/frysk-sys/lib/dwfl/DwAttributeNotFoundException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwDs.shenum b/frysk-sys/lib/dwfl/DwDs.shenum
index 2aad95d..0f350db 100644
--- a/frysk-sys/lib/dwfl/DwDs.shenum
+++ b/frysk-sys/lib/dwfl/DwDs.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwDsc.shenum b/frysk-sys/lib/dwfl/DwDsc.shenum
index 480ced2..5b02419 100644
--- a/frysk-sys/lib/dwfl/DwDsc.shenum
+++ b/frysk-sys/lib/dwfl/DwDsc.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwEnd.shenum b/frysk-sys/lib/dwfl/DwEnd.shenum
index cc4dabd..78ef991 100644
--- a/frysk-sys/lib/dwfl/DwEnd.shenum
+++ b/frysk-sys/lib/dwfl/DwEnd.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwException.java b/frysk-sys/lib/dwfl/DwException.java
index b07e83e..d9fdd71 100644
--- a/frysk-sys/lib/dwfl/DwException.java
+++ b/frysk-sys/lib/dwfl/DwException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwInl.shenum b/frysk-sys/lib/dwfl/DwInl.shenum
index 76cc958..835fecf 100644
--- a/frysk-sys/lib/dwfl/DwInl.shenum
+++ b/frysk-sys/lib/dwfl/DwInl.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwOp.shenum b/frysk-sys/lib/dwfl/DwOp.shenum
index 08f58de..542f10f 100644
--- a/frysk-sys/lib/dwfl/DwOp.shenum
+++ b/frysk-sys/lib/dwfl/DwOp.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwOrd.shenum b/frysk-sys/lib/dwfl/DwOrd.shenum
index 1755cd1..7d43a48 100644
--- a/frysk-sys/lib/dwfl/DwOrd.shenum
+++ b/frysk-sys/lib/dwfl/DwOrd.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwTag.shenum b/frysk-sys/lib/dwfl/DwTag.shenum
index 21be4df..3f74aa0 100644
--- a/frysk-sys/lib/dwfl/DwTag.shenum
+++ b/frysk-sys/lib/dwfl/DwTag.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/Dwarf.java b/frysk-sys/lib/dwfl/Dwarf.java
index 2c93a44..6a81d97 100644
--- a/frysk-sys/lib/dwfl/Dwarf.java
+++ b/frysk-sys/lib/dwfl/Dwarf.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwarfCommand.java b/frysk-sys/lib/dwfl/DwarfCommand.java
index a06ea92..dc0a55b 100644
--- a/frysk-sys/lib/dwfl/DwarfCommand.java
+++ b/frysk-sys/lib/dwfl/DwarfCommand.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwarfDie.java b/frysk-sys/lib/dwfl/DwarfDie.java
index bc2d24b..c0de7cd 100644
--- a/frysk-sys/lib/dwfl/DwarfDie.java
+++ b/frysk-sys/lib/dwfl/DwarfDie.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwarfDieFactory.java b/frysk-sys/lib/dwfl/DwarfDieFactory.java
index 5dc4e77..4c01fac 100644
--- a/frysk-sys/lib/dwfl/DwarfDieFactory.java
+++ b/frysk-sys/lib/dwfl/DwarfDieFactory.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwarfException.java b/frysk-sys/lib/dwfl/DwarfException.java
index 1f804ad..1997501 100644
--- a/frysk-sys/lib/dwfl/DwarfException.java
+++ b/frysk-sys/lib/dwfl/DwarfException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwarfOp.java b/frysk-sys/lib/dwfl/DwarfOp.java
index 4d1c66c..5d1e743 100644
--- a/frysk-sys/lib/dwfl/DwarfOp.java
+++ b/frysk-sys/lib/dwfl/DwarfOp.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/Dwfl.java b/frysk-sys/lib/dwfl/Dwfl.java
index eec1b59..6c78e41 100644
--- a/frysk-sys/lib/dwfl/Dwfl.java
+++ b/frysk-sys/lib/dwfl/Dwfl.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwflDie.java b/frysk-sys/lib/dwfl/DwflDie.java
index e4764ef..7e5f554 100644
--- a/frysk-sys/lib/dwfl/DwflDie.java
+++ b/frysk-sys/lib/dwfl/DwflDie.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwflLine.java b/frysk-sys/lib/dwfl/DwflLine.java
index 061e475..2536840 100644
--- a/frysk-sys/lib/dwfl/DwflLine.java
+++ b/frysk-sys/lib/dwfl/DwflLine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwflModule.java b/frysk-sys/lib/dwfl/DwflModule.java
index 859f5e9..02e4faf 100644
--- a/frysk-sys/lib/dwfl/DwflModule.java
+++ b/frysk-sys/lib/dwfl/DwflModule.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/DwflTestbed.java b/frysk-sys/lib/dwfl/DwflTestbed.java
index 3c931bf..175ad0f 100644
--- a/frysk-sys/lib/dwfl/DwflTestbed.java
+++ b/frysk-sys/lib/dwfl/DwflTestbed.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/Elf.java b/frysk-sys/lib/dwfl/Elf.java
index 28a0aa1..5ac8cd5 100644
--- a/frysk-sys/lib/dwfl/Elf.java
+++ b/frysk-sys/lib/dwfl/Elf.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfArchiveHeader.java b/frysk-sys/lib/dwfl/ElfArchiveHeader.java
index 852ed4d..bd9cdd0 100644
--- a/frysk-sys/lib/dwfl/ElfArchiveHeader.java
+++ b/frysk-sys/lib/dwfl/ElfArchiveHeader.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfArchiveSymbol.java b/frysk-sys/lib/dwfl/ElfArchiveSymbol.java
index c576a09..b417a89 100644
--- a/frysk-sys/lib/dwfl/ElfArchiveSymbol.java
+++ b/frysk-sys/lib/dwfl/ElfArchiveSymbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfCommand.java b/frysk-sys/lib/dwfl/ElfCommand.java
index 5dac6ab..6dec153 100644
--- a/frysk-sys/lib/dwfl/ElfCommand.java
+++ b/frysk-sys/lib/dwfl/ElfCommand.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfData.java b/frysk-sys/lib/dwfl/ElfData.java
index 8198e4c..b2259d7 100644
--- a/frysk-sys/lib/dwfl/ElfData.java
+++ b/frysk-sys/lib/dwfl/ElfData.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfDynamic.java b/frysk-sys/lib/dwfl/ElfDynamic.java
index 4883cd6..05eb6b9 100644
--- a/frysk-sys/lib/dwfl/ElfDynamic.java
+++ b/frysk-sys/lib/dwfl/ElfDynamic.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfEHeader.java b/frysk-sys/lib/dwfl/ElfEHeader.java
index 83acc8f..15d44a8 100644
--- a/frysk-sys/lib/dwfl/ElfEHeader.java
+++ b/frysk-sys/lib/dwfl/ElfEHeader.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfEMachine.java b/frysk-sys/lib/dwfl/ElfEMachine.java
index 066af8b..34cb3cc 100644
--- a/frysk-sys/lib/dwfl/ElfEMachine.java
+++ b/frysk-sys/lib/dwfl/ElfEMachine.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfError.java b/frysk-sys/lib/dwfl/ElfError.java
index 06bc322..c2d4b65 100644
--- a/frysk-sys/lib/dwfl/ElfError.java
+++ b/frysk-sys/lib/dwfl/ElfError.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfException.java b/frysk-sys/lib/dwfl/ElfException.java
index 6454a34..6053a25 100644
--- a/frysk-sys/lib/dwfl/ElfException.java
+++ b/frysk-sys/lib/dwfl/ElfException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfFileException.java b/frysk-sys/lib/dwfl/ElfFileException.java
index f60cd40..3a6351c 100644
--- a/frysk-sys/lib/dwfl/ElfFileException.java
+++ b/frysk-sys/lib/dwfl/ElfFileException.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfFlags.java b/frysk-sys/lib/dwfl/ElfFlags.java
index 85a6d8f..bde305f 100644
--- a/frysk-sys/lib/dwfl/ElfFlags.java
+++ b/frysk-sys/lib/dwfl/ElfFlags.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfKind.java b/frysk-sys/lib/dwfl/ElfKind.java
index 84caafa..2abf2b3 100644
--- a/frysk-sys/lib/dwfl/ElfKind.java
+++ b/frysk-sys/lib/dwfl/ElfKind.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfNhdr.java b/frysk-sys/lib/dwfl/ElfNhdr.java
index 02bc7b6..9553acf 100644
--- a/frysk-sys/lib/dwfl/ElfNhdr.java
+++ b/frysk-sys/lib/dwfl/ElfNhdr.java
@@ -12,8 +12,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfNhdrType.java b/frysk-sys/lib/dwfl/ElfNhdrType.java
index 45c83cf..f231d23 100644
--- a/frysk-sys/lib/dwfl/ElfNhdrType.java
+++ b/frysk-sys/lib/dwfl/ElfNhdrType.java
@@ -13,8 +13,7 @@
 //General Public License for more details.
 
 //You should have received a copy of the GNU General Public License
-//along with FRYSK; if not, write to the Free Software Foundation,
-//Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 
 //In addition, as a special exception, Red Hat, Inc. gives You the
 //additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfPHeader.java b/frysk-sys/lib/dwfl/ElfPHeader.java
index 86f0d80..9d0e374 100644
--- a/frysk-sys/lib/dwfl/ElfPHeader.java
+++ b/frysk-sys/lib/dwfl/ElfPHeader.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfPrAuxv.java b/frysk-sys/lib/dwfl/ElfPrAuxv.java
index 37b2d81..dfe6b09 100644
--- a/frysk-sys/lib/dwfl/ElfPrAuxv.java
+++ b/frysk-sys/lib/dwfl/ElfPrAuxv.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfPrFPRegSet.java b/frysk-sys/lib/dwfl/ElfPrFPRegSet.java
index 94fd9bb..3cdc659 100644
--- a/frysk-sys/lib/dwfl/ElfPrFPRegSet.java
+++ b/frysk-sys/lib/dwfl/ElfPrFPRegSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfPrXFPRegSet.java b/frysk-sys/lib/dwfl/ElfPrXFPRegSet.java
index 55c93d3..c8d9806 100644
--- a/frysk-sys/lib/dwfl/ElfPrXFPRegSet.java
+++ b/frysk-sys/lib/dwfl/ElfPrXFPRegSet.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfPrpsinfo.java b/frysk-sys/lib/dwfl/ElfPrpsinfo.java
index ce14b7d..c4ccd49 100644
--- a/frysk-sys/lib/dwfl/ElfPrpsinfo.java
+++ b/frysk-sys/lib/dwfl/ElfPrpsinfo.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfPrstatus.java b/frysk-sys/lib/dwfl/ElfPrstatus.java
index 819a182..eb9ac43 100644
--- a/frysk-sys/lib/dwfl/ElfPrstatus.java
+++ b/frysk-sys/lib/dwfl/ElfPrstatus.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfRel.java b/frysk-sys/lib/dwfl/ElfRel.java
index bb1674d..e173cfb 100644
--- a/frysk-sys/lib/dwfl/ElfRel.java
+++ b/frysk-sys/lib/dwfl/ElfRel.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSection.java b/frysk-sys/lib/dwfl/ElfSection.java
index 359ee57..183016b 100644
--- a/frysk-sys/lib/dwfl/ElfSection.java
+++ b/frysk-sys/lib/dwfl/ElfSection.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSectionHeader.java b/frysk-sys/lib/dwfl/ElfSectionHeader.java
index 320bf14..f312f04 100644
--- a/frysk-sys/lib/dwfl/ElfSectionHeader.java
+++ b/frysk-sys/lib/dwfl/ElfSectionHeader.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSectionHeaderTypes.java b/frysk-sys/lib/dwfl/ElfSectionHeaderTypes.java
index 41c0b09..ed1a5c5 100644
--- a/frysk-sys/lib/dwfl/ElfSectionHeaderTypes.java
+++ b/frysk-sys/lib/dwfl/ElfSectionHeaderTypes.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSymbol.java b/frysk-sys/lib/dwfl/ElfSymbol.java
index 1e18c0e..b4d57e2 100644
--- a/frysk-sys/lib/dwfl/ElfSymbol.java
+++ b/frysk-sys/lib/dwfl/ElfSymbol.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSymbolBinding.java b/frysk-sys/lib/dwfl/ElfSymbolBinding.java
index aa2384a..3c3db51 100644
--- a/frysk-sys/lib/dwfl/ElfSymbolBinding.java
+++ b/frysk-sys/lib/dwfl/ElfSymbolBinding.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSymbolType.java b/frysk-sys/lib/dwfl/ElfSymbolType.java
index 99674d4..34b3da5 100644
--- a/frysk-sys/lib/dwfl/ElfSymbolType.java
+++ b/frysk-sys/lib/dwfl/ElfSymbolType.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSymbolVersion.java b/frysk-sys/lib/dwfl/ElfSymbolVersion.java
index 7590de9..76585a6 100644
--- a/frysk-sys/lib/dwfl/ElfSymbolVersion.java
+++ b/frysk-sys/lib/dwfl/ElfSymbolVersion.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfSymbolVisibility.java b/frysk-sys/lib/dwfl/ElfSymbolVisibility.java
index f2e9553..9466600 100644
--- a/frysk-sys/lib/dwfl/ElfSymbolVisibility.java
+++ b/frysk-sys/lib/dwfl/ElfSymbolVisibility.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ElfType.java b/frysk-sys/lib/dwfl/ElfType.java
index 56e8e9a..05d9f6a 100644
--- a/frysk-sys/lib/dwfl/ElfType.java
+++ b/frysk-sys/lib/dwfl/ElfType.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/Instruction.java b/frysk-sys/lib/dwfl/Instruction.java
index d6ab20e..c377273 100644
--- a/frysk-sys/lib/dwfl/Instruction.java
+++ b/frysk-sys/lib/dwfl/Instruction.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/ModuleElfBias.java b/frysk-sys/lib/dwfl/ModuleElfBias.java
index 02cec0a..821c315 100644
--- a/frysk-sys/lib/dwfl/ModuleElfBias.java
+++ b/frysk-sys/lib/dwfl/ModuleElfBias.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/SymbolBuilder.java b/frysk-sys/lib/dwfl/SymbolBuilder.java
index 8a6d92f..cbadedb 100644
--- a/frysk-sys/lib/dwfl/SymbolBuilder.java
+++ b/frysk-sys/lib/dwfl/SymbolBuilder.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/TestDwarfDie.java b/frysk-sys/lib/dwfl/TestDwarfDie.java
index 3d18a0c..a090ccf 100644
--- a/frysk-sys/lib/dwfl/TestDwarfDie.java
+++ b/frysk-sys/lib/dwfl/TestDwarfDie.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/TestDwfl.java b/frysk-sys/lib/dwfl/TestDwfl.java
index 2d2bcc4..fa6dc83 100644
--- a/frysk-sys/lib/dwfl/TestDwfl.java
+++ b/frysk-sys/lib/dwfl/TestDwfl.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/TestElf.java b/frysk-sys/lib/dwfl/TestElf.java
index 9f35cfa..49d18c4 100644
--- a/frysk-sys/lib/dwfl/TestElf.java
+++ b/frysk-sys/lib/dwfl/TestElf.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/DwException.cxx b/frysk-sys/lib/dwfl/jni/DwException.cxx
index abd01de..148b6d1 100644
--- a/frysk-sys/lib/dwfl/jni/DwException.cxx
+++ b/frysk-sys/lib/dwfl/jni/DwException.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/Dwarf.cxx b/frysk-sys/lib/dwfl/jni/Dwarf.cxx
index a3af80f..323abf9 100644
--- a/frysk-sys/lib/dwfl/jni/Dwarf.cxx
+++ b/frysk-sys/lib/dwfl/jni/Dwarf.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/DwarfDie.cxx b/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
index cbb0cb1..b4071c7 100644
--- a/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
+++ b/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/Dwfl.cxx b/frysk-sys/lib/dwfl/jni/Dwfl.cxx
index 672d052..00b2c70 100644
--- a/frysk-sys/lib/dwfl/jni/Dwfl.cxx
+++ b/frysk-sys/lib/dwfl/jni/Dwfl.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/DwflLine.cxx b/frysk-sys/lib/dwfl/jni/DwflLine.cxx
index 32d67ad..5c60411 100644
--- a/frysk-sys/lib/dwfl/jni/DwflLine.cxx
+++ b/frysk-sys/lib/dwfl/jni/DwflLine.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/DwflModule.cxx b/frysk-sys/lib/dwfl/jni/DwflModule.cxx
index d645edf..877e0b2 100644
--- a/frysk-sys/lib/dwfl/jni/DwflModule.cxx
+++ b/frysk-sys/lib/dwfl/jni/DwflModule.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/Elf.cxx b/frysk-sys/lib/dwfl/jni/Elf.cxx
index cc16245..da9d2a9 100644
--- a/frysk-sys/lib/dwfl/jni/Elf.cxx
+++ b/frysk-sys/lib/dwfl/jni/Elf.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfArchiveSymbol.cxx b/frysk-sys/lib/dwfl/jni/ElfArchiveSymbol.cxx
index 6539667..e1614ca 100644
--- a/frysk-sys/lib/dwfl/jni/ElfArchiveSymbol.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfArchiveSymbol.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfData.cxx b/frysk-sys/lib/dwfl/jni/ElfData.cxx
index 33552c4..d8cd4fe 100644
--- a/frysk-sys/lib/dwfl/jni/ElfData.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfData.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfDynamic.cxx b/frysk-sys/lib/dwfl/jni/ElfDynamic.cxx
index 7878ad3..03803a3 100644
--- a/frysk-sys/lib/dwfl/jni/ElfDynamic.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfDynamic.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfNhdr.cxx b/frysk-sys/lib/dwfl/jni/ElfNhdr.cxx
index c11ba6d..f453d88 100644
--- a/frysk-sys/lib/dwfl/jni/ElfNhdr.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfNhdr.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfPrAuxv.cxx b/frysk-sys/lib/dwfl/jni/ElfPrAuxv.cxx
index 09debcb..e599e5c 100644
--- a/frysk-sys/lib/dwfl/jni/ElfPrAuxv.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfPrAuxv.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfPrFPRegSet.cxx b/frysk-sys/lib/dwfl/jni/ElfPrFPRegSet.cxx
index 3eaf148..a355cea 100644
--- a/frysk-sys/lib/dwfl/jni/ElfPrFPRegSet.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfPrFPRegSet.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfPrXFPRegSet.cxx b/frysk-sys/lib/dwfl/jni/ElfPrXFPRegSet.cxx
index e21a481..3debd8d 100644
--- a/frysk-sys/lib/dwfl/jni/ElfPrXFPRegSet.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfPrXFPRegSet.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfPrpsinfo.cxx b/frysk-sys/lib/dwfl/jni/ElfPrpsinfo.cxx
index 48ede0d..5806d9a 100644
--- a/frysk-sys/lib/dwfl/jni/ElfPrpsinfo.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfPrpsinfo.cxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfPrstatus.cxx b/frysk-sys/lib/dwfl/jni/ElfPrstatus.cxx
index 704a230..9bd7168 100644
--- a/frysk-sys/lib/dwfl/jni/ElfPrstatus.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfPrstatus.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfRel.cxx b/frysk-sys/lib/dwfl/jni/ElfRel.cxx
index a72ef3a..2e6f6ec 100644
--- a/frysk-sys/lib/dwfl/jni/ElfRel.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfRel.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfSection.cxx b/frysk-sys/lib/dwfl/jni/ElfSection.cxx
index 0aa3bd9..5123ac1 100644
--- a/frysk-sys/lib/dwfl/jni/ElfSection.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfSection.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/dwfl/jni/ElfSymbol.cxx b/frysk-sys/lib/dwfl/jni/ElfSymbol.cxx
index c00ea47..dee571f 100644
--- a/frysk-sys/lib/dwfl/jni/ElfSymbol.cxx
+++ b/frysk-sys/lib/dwfl/jni/ElfSymbol.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/stdcpp/Demangler.java b/frysk-sys/lib/stdcpp/Demangler.java
index d738cf3..1dd355c 100644
--- a/frysk-sys/lib/stdcpp/Demangler.java
+++ b/frysk-sys/lib/stdcpp/Demangler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/stdcpp/TestDemangler.java b/frysk-sys/lib/stdcpp/TestDemangler.java
index 994a029..aa982f3 100644
--- a/frysk-sys/lib/stdcpp/TestDemangler.java
+++ b/frysk-sys/lib/stdcpp/TestDemangler.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/stdcpp/jni/Demangler.cxx b/frysk-sys/lib/stdcpp/jni/Demangler.cxx
index 43cae48..4b39799 100644
--- a/frysk-sys/lib/stdcpp/jni/Demangler.cxx
+++ b/frysk-sys/lib/stdcpp/jni/Demangler.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/AddressSpace.java b/frysk-sys/lib/unwind/AddressSpace.java
index 0f69dd2..5f72771 100644
--- a/frysk-sys/lib/unwind/AddressSpace.java
+++ b/frysk-sys/lib/unwind/AddressSpace.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/Cursor.java b/frysk-sys/lib/unwind/Cursor.java
index da977c1..6f56ff8 100644
--- a/frysk-sys/lib/unwind/Cursor.java
+++ b/frysk-sys/lib/unwind/Cursor.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/ElfImage.java b/frysk-sys/lib/unwind/ElfImage.java
index 872c45d..d82314f 100644
--- a/frysk-sys/lib/unwind/ElfImage.java
+++ b/frysk-sys/lib/unwind/ElfImage.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/GenRegEnum.awk b/frysk-sys/lib/unwind/GenRegEnum.awk
index fa6fcb6..377c49b 100644
--- a/frysk-sys/lib/unwind/GenRegEnum.awk
+++ b/frysk-sys/lib/unwind/GenRegEnum.awk
@@ -15,8 +15,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/ProcInfo.java b/frysk-sys/lib/unwind/ProcInfo.java
index a76f0db..78665a4 100644
--- a/frysk-sys/lib/unwind/ProcInfo.java
+++ b/frysk-sys/lib/unwind/ProcInfo.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/TestUnwind.java b/frysk-sys/lib/unwind/TestUnwind.java
index 687f2d9..6ba013d 100644
--- a/frysk-sys/lib/unwind/TestUnwind.java
+++ b/frysk-sys/lib/unwind/TestUnwind.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/Unwind.java b/frysk-sys/lib/unwind/Unwind.java
index 540888c..ff67d78 100644
--- a/frysk-sys/lib/unwind/Unwind.java
+++ b/frysk-sys/lib/unwind/Unwind.java
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindPPC32.java-sh b/frysk-sys/lib/unwind/UnwindPPC32.java-sh
index 3d3050e..251d547 100644
--- a/frysk-sys/lib/unwind/UnwindPPC32.java-sh
+++ b/frysk-sys/lib/unwind/UnwindPPC32.java-sh
@@ -16,8 +16,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindPPC64.java-sh b/frysk-sys/lib/unwind/UnwindPPC64.java-sh
index ec3e721..dd5d415 100644
--- a/frysk-sys/lib/unwind/UnwindPPC64.java-sh
+++ b/frysk-sys/lib/unwind/UnwindPPC64.java-sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindRegistersPPC32.shenum b/frysk-sys/lib/unwind/UnwindRegistersPPC32.shenum
index 785bd65..ca41d4f 100644
--- a/frysk-sys/lib/unwind/UnwindRegistersPPC32.shenum
+++ b/frysk-sys/lib/unwind/UnwindRegistersPPC32.shenum
@@ -16,8 +16,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindRegistersPPC64.shenum b/frysk-sys/lib/unwind/UnwindRegistersPPC64.shenum
index b370bb7..28cbede 100644
--- a/frysk-sys/lib/unwind/UnwindRegistersPPC64.shenum
+++ b/frysk-sys/lib/unwind/UnwindRegistersPPC64.shenum
@@ -16,8 +16,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindRegistersX86.shenum b/frysk-sys/lib/unwind/UnwindRegistersX86.shenum
index 3e097b1..f7b8615 100644
--- a/frysk-sys/lib/unwind/UnwindRegistersX86.shenum
+++ b/frysk-sys/lib/unwind/UnwindRegistersX86.shenum
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindRegistersX8664.shenum b/frysk-sys/lib/unwind/UnwindRegistersX8664.shenum
index c5d9d44..b5273fc 100644
--- a/frysk-sys/lib/unwind/UnwindRegistersX8664.shenum
+++ b/frysk-sys/lib/unwind/UnwindRegistersX8664.shenum
@@ -14,8 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindX86.java-sh b/frysk-sys/lib/unwind/UnwindX86.java-sh
index ec3e721..dd5d415 100644
--- a/frysk-sys/lib/unwind/UnwindX86.java-sh
+++ b/frysk-sys/lib/unwind/UnwindX86.java-sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/UnwindX8664.java-sh b/frysk-sys/lib/unwind/UnwindX8664.java-sh
index ec3e721..dd5d415 100644
--- a/frysk-sys/lib/unwind/UnwindX8664.java-sh
+++ b/frysk-sys/lib/unwind/UnwindX8664.java-sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/jni/Unwind.cxx b/frysk-sys/lib/unwind/jni/Unwind.cxx
index 21809d1..1ac97dc 100644
--- a/frysk-sys/lib/unwind/jni/Unwind.cxx
+++ b/frysk-sys/lib/unwind/jni/Unwind.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 // 
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 // 
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/jni/UnwindH.hxx b/frysk-sys/lib/unwind/jni/UnwindH.hxx
index 6c16f39..0ebfadf 100644
--- a/frysk-sys/lib/unwind/jni/UnwindH.hxx
+++ b/frysk-sys/lib/unwind/jni/UnwindH.hxx
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/jni/UnwindPPC32.cxx b/frysk-sys/lib/unwind/jni/UnwindPPC32.cxx
index aeb48c0..2919d52 100644
--- a/frysk-sys/lib/unwind/jni/UnwindPPC32.cxx
+++ b/frysk-sys/lib/unwind/jni/UnwindPPC32.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/jni/UnwindPPC64.cxx b/frysk-sys/lib/unwind/jni/UnwindPPC64.cxx
index dcd2e49..a5e2d8b 100644
--- a/frysk-sys/lib/unwind/jni/UnwindPPC64.cxx
+++ b/frysk-sys/lib/unwind/jni/UnwindPPC64.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/jni/UnwindX86.cxx b/frysk-sys/lib/unwind/jni/UnwindX86.cxx
index 20b49a5..c84684a 100644
--- a/frysk-sys/lib/unwind/jni/UnwindX86.cxx
+++ b/frysk-sys/lib/unwind/jni/UnwindX86.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-sys/lib/unwind/jni/UnwindX8664.cxx b/frysk-sys/lib/unwind/jni/UnwindX8664.cxx
index b638d4a..e5f8525 100644
--- a/frysk-sys/lib/unwind/jni/UnwindX8664.cxx
+++ b/frysk-sys/lib/unwind/jni/UnwindX8664.cxx
@@ -12,8 +12,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of FRYSK with code not covered
diff --git a/frysk-top/.settings/org.eclipse.jdt.ui.prefs b/frysk-top/.settings/org.eclipse.jdt.ui.prefs
index ade979c..f11d429 100644
--- a/frysk-top/.settings/org.eclipse.jdt.ui.prefs
+++ b/frysk-top/.settings/org.eclipse.jdt.ui.prefs
@@ -1,5 +1,4 @@
 #Thu Jun 21 14:46:19 GMT-04:00 2007
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"?>\n<templates><template id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment" description\="Comment for getter method" context\="gettercomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\n * @return the ${bare_field_name}\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment" description\="Comment for setter method" context\="settercomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment" description\="Comment for created constructors" context\="constructorcomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\n * ${tags}\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment" description\="Comment for created Java files" context\="filecomment_context" enabled\="true" deleted\="false" autoinsert\="false">/**\n *\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment" description\="Comment for created types" context\="typecomment_context" enabled\="true" deleted\="false" autoinsert\="false">/**\n * ${tags}\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment" description\="Comment for fields" context\="fieldcomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\n * \n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment" description\="Comment for non-overriding methods" context\="methodcomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\n * ${tags}\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment" description\="Comment for overriding methods" context\="overridecomment_context" enabled\="true" deleted\="false" autoinsert\="true">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment" description\="Comment for delegate methods" context\="delegatecomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\n * ${tags}\n * ${see_to_target}\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype" description\="Newly created files" context\="newtype_context" enabled\="true" deleted\="false" autoinsert\="false">${filecomment}\n// This file is part of the program FRYSK.\n//\n// Copyright 2007, Red Hat Inc.\n//\n// FRYSK is free software; you can redistribute it and/or modify it\n// under the terms of the GNU General Public License as published by\n// the Free Software Foundation; version 2 of the License.\n//\n// FRYSK is distributed in the hope that it will be useful, but\n// WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n// General Public License for more details.\n// \n// You should have received a copy of the GNU General Public License\n// along with FRYSK; if not, write to the Free Software Foundation,\n// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\n// \n// In addition, as a special exception, Red Hat, Inc. gives You the\n// additional right to link the code of FRYSK with code not covered\n// under the GNU General Public License ("Non-GPL Code") and to\n// distribute linked combinations including the two, subject to the\n// limitations in this paragraph. Non-GPL Code permitted under this\n// exception must only link to the code of FRYSK through those well\n// defined interfaces identified in the file named EXCEPTION found in\n// the source code files (the "Approved Interfaces"). The files of\n// Non-GPL Code may instantiate templates or use macros or inline\n// functions from the Approved Interfaces without causing the\n// resulting work to be covered by the GNU General Public\n// License. Only Red Hat, Inc. may make changes or additions to the\n// list of Approved Interfaces. You must obey the GNU General Public\n// License in all respects for all of the FRYSK code and other code\n// used in conjunction with FRYSK except the Non-GPL Code covered by\n// this exception. If you modify this file, you may extend this\n// exception to your version of the file, but you are not obligated to\n// do so. If you do not wish to provide this exception without\n// modification, you must delete this exception statement from your\n// version and license this file solely under the GPL without\n// exception.\n\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody" description\="Code in new class type bodies" context\="classbody_context" enabled\="true" deleted\="false" autoinsert\="true">\n</template><template id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody" description\="Code in new interface type bodies" context\="interfacebody_context" enabled\="true" deleted\="false" autoinsert\="true">\n</template><template id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody" description\="Code in new enum type bodies" context\="enumbody_context" enabled\="true" deleted\="false" autoinsert\="true">\n</template><template id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody" description\="Code in new annotation type bodies" context\="annotationbody_context" enabled\="true" deleted\="false" autoinsert\="true">\n</template><template id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock" description\="Code in new catch blocks" context\="catchblock_context" enabled\="true" deleted\="false" autoinsert\="false">${exception_var}.printStackTrace();</template><template id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody" description\="Code in created method stubs" context\="methodbody_context" enabled\="true" deleted\="false" autoinsert\="false">${body_statement}</template><template id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody" description\="Code in created constructor stubs" context\="constructorbody_context" enabled\="true" deleted\="false" autoinsert\="false">${body_statement}</template><template id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody" description\="Code in created getters" context\="getterbody_context" enabled\="true" deleted\="false" autoinsert\="true">return ${field};</template><template id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody" description\="Code in created setters" context\="setterbody_context" enabled\="true" deleted\="false" autoinsert\="true">${field} \= ${param};</template></templates>
 eclipse.preferences.version=1
 internal.default.compliance=default
 formatter_profile=org.eclipse.jdt.ui.default.sun_profile
diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
index 49444fb..3e82230 100644
--- a/frysk-top/Makefile.am
+++ b/frysk-top/Makefile.am
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-top/autogen.sh b/frysk-top/autogen.sh
index 3b6be8c..da01510 100755
--- a/frysk-top/autogen.sh
+++ b/frysk-top/autogen.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-top/bootstrap.sh b/frysk-top/bootstrap.sh
index d63559a..a426ed4 100755
--- a/frysk-top/bootstrap.sh
+++ b/frysk-top/bootstrap.sh
@@ -13,8 +13,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-top/configure.ac b/frysk-top/configure.ac
index bf122ce..f57136a 100644
--- a/frysk-top/configure.ac
+++ b/frysk-top/configure.ac
@@ -12,8 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with FRYSK; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# along with FRYSK.  If not, see <http://www.gnu.org/licenses/>.
 # 
 # In addition, as a special exception, Red Hat, Inc. gives You the
 # additional right to link the code of FRYSK with code not covered
diff --git a/frysk-utrace/utracer/judb/Utrace.java b/frysk-utrace/utracer/judb/Utrace.java
index 7612aad..ec2ed37 100644
--- a/frysk-utrace/utracer/judb/Utrace.java
+++ b/frysk-utrace/utracer/judb/Utrace.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/swing/Udb.java b/frysk-utrace/utracer/swing/Udb.java
index 5c6a685..c7fd223 100644
--- a/frysk-utrace/utracer/swing/Udb.java
+++ b/frysk-utrace/utracer/swing/Udb.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/swing/Utrace.java b/frysk-utrace/utracer/swing/Utrace.java
index 3eb0db0..fd8b6a7 100644
--- a/frysk-utrace/utracer/swing/Utrace.java
+++ b/frysk-utrace/utracer/swing/Utrace.java
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb-i386.c b/frysk-utrace/utracer/udb-i386.c
index 4f94421..d9da4c1 100644
--- a/frysk-utrace/utracer/udb-i386.c
+++ b/frysk-utrace/utracer/udb-i386.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb-i386.h b/frysk-utrace/utracer/udb-i386.h
index 7f0087f..817d592 100644
--- a/frysk-utrace/utracer/udb-i386.h
+++ b/frysk-utrace/utracer/udb-i386.h
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb-module.c b/frysk-utrace/utracer/udb-module.c
index 1873f74..53a71da 100644
--- a/frysk-utrace/utracer/udb-module.c
+++ b/frysk-utrace/utracer/udb-module.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb-response.c b/frysk-utrace/utracer/udb-response.c
index 9944b0f..e999263 100644
--- a/frysk-utrace/utracer/udb-response.c
+++ b/frysk-utrace/utracer/udb-response.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb-text-ui.c b/frysk-utrace/utracer/udb-text-ui.c
index 3f24c51..6537109 100644
--- a/frysk-utrace/utracer/udb-text-ui.c
+++ b/frysk-utrace/utracer/udb-text-ui.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb.c b/frysk-utrace/utracer/udb.c
index 999d6e3..56419df 100644
--- a/frysk-utrace/utracer/udb.c
+++ b/frysk-utrace/utracer/udb.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/udb.h b/frysk-utrace/utracer/udb.h
index 40e7560..43d9339 100644
--- a/frysk-utrace/utracer/udb.h
+++ b/frysk-utrace/utracer/udb.h
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/include/utracer-errmsgs.h b/frysk-utrace/utracer/utracer/include/utracer-errmsgs.h
index 0a3113f..5b677a4 100644
--- a/frysk-utrace/utracer/utracer/include/utracer-errmsgs.h
+++ b/frysk-utrace/utracer/utracer/include/utracer-errmsgs.h
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/include/utracer.h b/frysk-utrace/utracer/utracer/include/utracer.h
index f73327d..b5ffacd 100644
--- a/frysk-utrace/utracer/utracer/include/utracer.h
+++ b/frysk-utrace/utracer/utracer/include/utracer.h
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/module/utracer-base.c b/frysk-utrace/utracer/utracer/module/utracer-base.c
index 31dd6a1..989b768 100644
--- a/frysk-utrace/utracer/utracer/module/utracer-base.c
+++ b/frysk-utrace/utracer/utracer/module/utracer-base.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/module/utracer-cf-io.c b/frysk-utrace/utracer/utracer/module/utracer-cf-io.c
index b4aac1c..5fed7d6 100644
--- a/frysk-utrace/utracer/utracer/module/utracer-cf-io.c
+++ b/frysk-utrace/utracer/utracer/module/utracer-cf-io.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/module/utracer-if-io.c b/frysk-utrace/utracer/utracer/module/utracer-if-io.c
index 21ac013..23ecae3 100644
--- a/frysk-utrace/utracer/utracer/module/utracer-if-io.c
+++ b/frysk-utrace/utracer/utracer/module/utracer-if-io.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/module/utracer-ioctl.c b/frysk-utrace/utracer/utracer/module/utracer-ioctl.c
index defc85a..7431980 100644
--- a/frysk-utrace/utracer/utracer/module/utracer-ioctl.c
+++ b/frysk-utrace/utracer/utracer/module/utracer-ioctl.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/module/utracer-private.h b/frysk-utrace/utracer/utracer/module/utracer-private.h
index 6cbb4f6..76d7b77 100644
--- a/frysk-utrace/utracer/utracer/module/utracer-private.h
+++ b/frysk-utrace/utracer/utracer/module/utracer-private.h
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered
diff --git a/frysk-utrace/utracer/utracer/utracer/utracer.c b/frysk-utrace/utracer/utracer/utracer/utracer.c
index cb08f10..95c82aa 100644
--- a/frysk-utrace/utracer/utracer/utracer/utracer.c
+++ b/frysk-utrace/utracer/utracer/utracer/utracer.c
@@ -13,8 +13,7 @@
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Utracer; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+// along with Utracer.  If not, see <http://www.gnu.org/licenses/>.
 //
 // In addition, as a special exception, Red Hat, Inc. gives You the
 // additional right to link the code of Utracer with code not covered