diff --git a/audio/squash/files/patch-FIXLOCK-src_global_squash.c b/audio/squash/files/patch-FIXLOCK-src_global_squash.c
index 256084356e07..0b94b31b4f08 100644
--- a/audio/squash/files/patch-FIXLOCK-src_global_squash.c
+++ b/audio/squash/files/patch-FIXLOCK-src_global_squash.c
@@ -1,5 +1,5 @@
---- ./src/global_squash.c~	Fri Dec  5 21:23:51 2003
-+++ ./src/global_squash.c	Thu Feb 26 18:57:02 2004
+--- ./src/global_squash.c.orig	2003-12-05 21:23:51.000000000 +0100
++++ ./src/global_squash.c	2011-03-21 17:21:19.000000000 +0100
 @@ -143,7 +143,6 @@
              playlist_queue_song( song, state_info.raw_songs[state_info.current_song].position );
          }
diff --git a/audio/squash/files/patch-include::global.h b/audio/squash/files/patch-include__global.h
similarity index 50%
rename from audio/squash/files/patch-include::global.h
rename to audio/squash/files/patch-include__global.h
index 153a14df38f4..72822f196f81 100644
--- a/audio/squash/files/patch-include::global.h
+++ b/audio/squash/files/patch-include__global.h
@@ -1,9 +1,7 @@
-$FreeBSD$
-
---- include/global.h~ 	Mon Aug  4 16:43:16 2003
-+++ include/global.h	Tue Aug  5 11:54:11 2003
-@@ -40,7 +40,7 @@
- #include <ao/ao.h>
+--- ./include/global.h.orig	2003-12-18 22:51:43.000000000 +0100
++++ ./include/global.h	2011-03-21 17:21:19.000000000 +0100
+@@ -57,7 +57,7 @@
+ #endif
  #include <math.h>
  #include <stdarg.h>
 -#include <wait.h>
diff --git a/audio/squash/files/patch-include::play_flac.h b/audio/squash/files/patch-include__play_flac.h
similarity index 93%
rename from audio/squash/files/patch-include::play_flac.h
rename to audio/squash/files/patch-include__play_flac.h
index 1e11fcb98504..c23848fc65e5 100644
--- a/audio/squash/files/patch-include::play_flac.h
+++ b/audio/squash/files/patch-include__play_flac.h
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- include/play_flac.h.orig
-+++ include/play_flac.h
+--- ./include/play_flac.h.orig	2003-10-12 21:14:33.000000000 +0200
++++ ./include/play_flac.h	2011-03-21 17:21:19.000000000 +0100
 @@ -32,7 +32,7 @@
   * Structures
   */
diff --git a/audio/squash/files/patch-src::display.c b/audio/squash/files/patch-src__display.c
similarity index 60%
rename from audio/squash/files/patch-src::display.c
rename to audio/squash/files/patch-src__display.c
index ffc34b199f96..eddc376beaad 100644
--- a/audio/squash/files/patch-src::display.c
+++ b/audio/squash/files/patch-src__display.c
@@ -1,9 +1,7 @@
-$FreeBSD$
-
---- src/display.c~	Tue Jul 29 06:56:49 2003
-+++ src/display.c	Tue Aug  5 11:59:03 2003
-@@ -673,6 +673,22 @@
-     wrefresh( win );
+--- ./src/display.c.orig	2003-12-07 22:20:41.000000000 +0100
++++ ./src/display.c	2011-03-21 17:21:19.000000000 +0100
+@@ -179,6 +179,22 @@
+     return (void *)NULL;
  }
  
 +char *mystrndup(const char *s, size_t sz)
@@ -23,9 +21,9 @@ $FreeBSD$
 +}
 +
  /*
-  * Draw the info window.
-  */
-@@ -744,7 +760,7 @@
+  * Draw the screen,  This takes into account rebuilding all the
+  * windows in case of screen resize, or if a window changes size.
+@@ -1567,7 +1583,7 @@
      }
  
      /* Clip filename */
diff --git a/audio/squash/files/patch-src::play_flac.c b/audio/squash/files/patch-src__play_flac.c
similarity index 98%
rename from audio/squash/files/patch-src::play_flac.c
rename to audio/squash/files/patch-src__play_flac.c
index e703da247422..57fc5d2fe2af 100644
--- a/audio/squash/files/patch-src::play_flac.c
+++ b/audio/squash/files/patch-src__play_flac.c
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- src/play_flac.c.orig
-+++ src/play_flac.c
+--- ./src/play_flac.c.orig	2003-12-18 18:08:57.000000000 +0100
++++ ./src/play_flac.c	2011-03-21 17:21:19.000000000 +0100
 @@ -24,7 +24,7 @@
  #include "database.h" /* for insert_meta_data */
  #include "play_flac.h"
diff --git a/audio/squash/files/patch-src::player.c b/audio/squash/files/patch-src__player.c
similarity index 63%
rename from audio/squash/files/patch-src::player.c
rename to audio/squash/files/patch-src__player.c
index 580094e4c0f0..325165629ca2 100644
--- a/audio/squash/files/patch-src::player.c
+++ b/audio/squash/files/patch-src__player.c
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- src/player.c.orig
-+++ src/player.c
+--- ./src/player.c.orig	2003-12-18 22:53:12.000000000 +0100
++++ ./src/player.c	2011-03-21 17:21:19.000000000 +0100
 @@ -118,6 +118,7 @@
      char *full_filename;
      long start_position;