diff --git a/x11/ctwm/patches/patch-gram.y b/x11/ctwm/patches/patch-gram.y
index 5ba052c1e50..d5ab617b501 100644
--- a/x11/ctwm/patches/patch-gram.y
+++ b/x11/ctwm/patches/patch-gram.y
@@ -1,6 +1,6 @@
---- gram.y.orig	Tue Dec 11 15:38:52 2001
-+++ gram.y	Fri Jul  5 15:10:02 2002
-@@ -419,7 +419,6 @@
+--- gram.y.orig	Tue Dec 11 16:38:52 2001
++++ gram.y	Sun Sep  2 18:59:56 2012
+@@ -419,7 +419,6 @@ stmt		: error
  		| WINDOW_RING		{ list = &Scr->WindowRingL; }
  		  win_list
  		| WINDOW_RING           { Scr->WindowRingAll = TRUE; }
@@ -8,7 +8,7 @@
  		| WINDOW_RING_EXCLUDE    { if (!Scr->WindowRingL)
  		                              Scr->WindowRingAll = TRUE;
  		                          list = &Scr->WindowRingExcludeL; }
-@@ -427,6 +426,7 @@
+@@ -427,6 +426,7 @@ stmt		: error
  
  		| WINDOW_GEOMETRIES 	 {  }
  		  wingeom_list
@@ -16,18 +16,20 @@
  
  noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
  					    twmrc_error_prefix();
-@@ -683,8 +683,8 @@
+@@ -683,10 +683,10 @@ wingeom_entries	: /* Empty */
  		| wingeom_entries wingeom_entry
  		;
  
 -wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2) }
--
 +wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2); }
 +		;
  
  
+-
  squeeze		: SQUEEZE_TITLE { 
-@@ -834,6 +834,7 @@
+ 				    if (HasShape) Scr->SqueezeTitle = TRUE;
+ 				}
+@@ -834,6 +834,7 @@ occupy_workspc_entries	:   /* Empty */
  occupy_workspc_entry	: string {
  				AddToClientsList ($1, client);
  			  }
@@ -35,7 +37,7 @@
  
  occupy_window_list	: LB occupy_window_entries RB {}
  			;
-@@ -845,6 +846,7 @@
+@@ -845,6 +846,7 @@ occupy_window_entries	:   /* Empty */
  occupy_window_entry	: string {
  				AddToClientsList (workspace, $1);
  			  }
@@ -43,7 +45,7 @@
  
  icon_list	: LB icon_entries RB {}
  		;
-@@ -962,6 +964,8 @@
+@@ -962,6 +964,8 @@ string		: STRING		{ ptr = (char *)malloc(strlen((char*
  					  RemoveDQuote(ptr);
  					  $$ = (unsigned char*)ptr;
  					}
diff --git a/x11/ctwm/patches/patch-session.c b/x11/ctwm/patches/patch-session.c
index 4b9afbfd9ae..16ac60165d5 100644
--- a/x11/ctwm/patches/patch-session.c
+++ b/x11/ctwm/patches/patch-session.c
@@ -1,6 +1,6 @@
---- session.c.orig	Tue Dec 11 15:38:52 2001
-+++ session.c	Fri Jul  5 14:36:25 2002
-@@ -892,6 +892,7 @@
+--- session.c.orig	Tue Dec 11 16:38:52 2001
++++ session.c	Sun Sep  2 18:59:56 2012
+@@ -892,6 +892,7 @@ int *occupation; /* <== [ Matthew McNeill Feb 1997 ] =
      return found;
  }
  
@@ -8,7 +8,7 @@
  /*===[ Unique Filename Generator ]===========================================*/
  
  static char *
-@@ -922,6 +923,7 @@
+@@ -922,6 +923,7 @@ char *prefix;
  #endif
  }
  
@@ -16,7 +16,7 @@
  /*===[ SAVE WINDOW INFORMATION ]=============================================*/
  
  #ifndef PATH_MAX
-@@ -951,6 +953,10 @@
+@@ -951,6 +953,10 @@ SmPointer clientData;
      char discardCommand[PATH_MAX + 4];
      int numVals, i;
      char yes = 1;
@@ -27,7 +27,7 @@
      static int first_time = 1;
  
      if (first_time)
-@@ -1003,12 +1009,20 @@
+@@ -1003,12 +1009,20 @@ SmPointer clientData;
       *        no longer the same since the new format supports
       *        virtaul workspaces.
       *========================================================*/