diff --git a/contrib/gdm2s3m/COPYING b/contrib/gdm2s3m/COPYING
index d511905c1..f90922eea 100644
--- a/contrib/gdm2s3m/COPYING
+++ b/contrib/gdm2s3m/COPYING
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/contrib/libmodplug-0.8-fix-looping.diff b/contrib/libmodplug-0.8-fix-looping.diff
index 665e01f09..679cb179b 100644
--- a/contrib/libmodplug-0.8-fix-looping.diff
+++ b/contrib/libmodplug-0.8-fix-looping.diff
@@ -1,6 +1,6 @@
-diff -Nudr -U3 libmodplug-0.7.orig/src/sndmix.cpp libmodplug-0.7/src/sndmix.cpp
---- libmodplug-0.7.orig/src/sndmix.cpp	2003-10-11 03:26:20.000000000 +0100
-+++ libmodplug-0.7/src/sndmix.cpp	2005-05-23 19:50:38.097948768 +0100
+diff -Nudr -U3 libmodplug-0.8.orig/src/sndmix.cpp libmodplug-0.8/src/sndmix.cpp
+--- libmodplug-0.8.orig/src/sndmix.cpp	2003-10-11 03:26:20.000000000 +0100
++++ libmodplug-0.8/src/sndmix.cpp	2005-05-23 19:50:38.097948768 +0100
 @@ -373,7 +373,7 @@
  				// End of song ?
  				if ((m_nPattern == 0xFF) || (m_nCurrentPattern >= MAX_ORDERS))
diff --git a/docs/COPYING.DOC b/docs/COPYING.DOC
index d511905c1..f90922eea 100644
--- a/docs/COPYING.DOC
+++ b/docs/COPYING.DOC
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 3cc690d0e..6229d572c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -15,6 +15,8 @@ NOTE: This release was made by Alistair Strachan (ajs) and not by
 + Update the GPL boilerplates project-wide to the newest FSF address.
 + Fix a string range check causing an obscure crash in certain games.
 + Update the build.txt documentation.
++ Address documentation bugs found in the internal MZX help system (Terryn).
++ Fixed a recently introduced bug breaking the open command.
 
 December 14, 2005 - MZX 2.81c
 
diff --git a/package.sh b/package.sh
index 719fa05f1..6569e92cb 100755
--- a/package.sh
+++ b/package.sh
@@ -112,7 +112,7 @@ DOCS="docs/COPYING.DOC docs/changelog.txt docs/port.txt docs/macro.txt"
 #
 # Name of the PSP's Pad Configuration mapping file.
 #
-PADCONFIG="pad.config"
+PADCONFIG="" # pad.config
 
 #
 # MegaZeux's build system dependencies; these are packaged in
@@ -253,4 +253,4 @@ fi
 #
 echo "Unknown binary architecture.."
 echo
-usage
\ No newline at end of file
+usage