diff --git a/x11/ctwm/Makefile b/x11/ctwm/Makefile
index 5a8c32d5ca6..32bbb5b3967 100644
--- a/x11/ctwm/Makefile
+++ b/x11/ctwm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2002/03/21 21:25:55 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2002/07/05 07:21:50 kevlo Exp $
 
 COMMENT=	"twm, plus support for multiple virtual screens, etc"
 
-DISTNAME=	ctwm-3.5.2
+DISTNAME=	ctwm-3.6
 CATEGORIES=	x11
 NEED_VERSION=	1.515
 
@@ -13,10 +13,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=	${HOMEPAGE}/dist/
 
 USE_X11=	Yes
-
-CONFIGURE_STYLE=	imake
+CONFIGURE_STYLE= imake
 
 .include <bsd.port.mk>
diff --git a/x11/ctwm/distinfo b/x11/ctwm/distinfo
index 49788a4f580..757028cc3d5 100644
--- a/x11/ctwm/distinfo
+++ b/x11/ctwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (ctwm-3.5.2.tar.gz) = 2e17ac147b0168df6b0fd06d76df5b6a
-RMD160 (ctwm-3.5.2.tar.gz) = 0e1a0951c805cb5ee56662f1ddd537a901d57f0c
-SHA1 (ctwm-3.5.2.tar.gz) = 938750b798b53262f00436f7cd2228b414ce3057
+MD5 (ctwm-3.6.tar.gz) = c9e9e161e07e3d1c7e27684436f01e2b
+RMD160 (ctwm-3.6.tar.gz) = 83e6f770e58efb6dea5eacfcce345322ffdd416e
+SHA1 (ctwm-3.6.tar.gz) = 8a8cefd2273c748fd7ceded4c3553e5ca7a994ec
diff --git a/x11/ctwm/patches/patch-Imakefile b/x11/ctwm/patches/patch-Imakefile
new file mode 100644
index 00000000000..00ba094f59f
--- /dev/null
+++ b/x11/ctwm/patches/patch-Imakefile
@@ -0,0 +1,37 @@
+--- Imakefile.orig	Tue Dec 11 15:38:52 2001
++++ Imakefile	Fri Jul  5 14:54:29 2002
+@@ -11,7 +11,7 @@
+ #undef  USE_SOUND
+ #define XPM
+ #define USEM4
+-#undef X11R6
++#define X11R6
+ #undef I18N
+ 
+          YFLAGS = -d
+@@ -19,8 +19,8 @@
+        LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
+ 
+ #ifdef XPM
+-      XPMLIBDIR = 
+-      XPMINCDIR = 
++      XPMLIBDIR = -L/usr/X11R6/lib
++      XPMINCDIR = -I/usr/X11R6/include
+ 
+      XPMDEFINES = -DXPM
+          XPMLIB = $(XPMLIBDIR) -lXpm
+@@ -145,14 +145,6 @@
+ NormalLibraryTarget(ctwm, libctwm.o)
+ ComplexProgramTarget(ctwm)
+ InstallNonExecFile(system.ctwmrc,$(TWMDIR))
+-#ifdef XPM
+-install:: xpm
+-	MakeDir($(DESTDIR)$(TWMDIR)/images)
+-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+-	for i in xpm/?* ; do \
+-		(set -x; $(INSTALL) -c $(INSTLIBFLAGS) $$i $(DESTDIR)$(TWMDIR)/images); \
+-	done
+-#endif
+ 
+ gram.h gram.c: gram.y
+ 	$(YACC) $(YFLAGS) gram.y
diff --git a/x11/ctwm/patches/patch-aa b/x11/ctwm/patches/patch-aa
deleted file mode 100644
index d25e4e23874..00000000000
--- a/x11/ctwm/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- Imakefile.orig	Mon Jul 10 23:55:01 2000
-+++ Imakefile	Mon Jul 10 23:56:21 2000
-@@ -11,7 +11,7 @@
- #undef  USE_SOUND
- #define XPM
- #define USEM4
--#undef X11R6
-+#define X11R6
- #define I18N
- 
-          YFLAGS = -d
-@@ -19,8 +19,8 @@
-        LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
- 
- #ifdef XPM
--      XPMLIBDIR = 
--      XPMINCDIR = 
-+      XPMLIBDIR = -L/usr/X11R6/lib
-+      XPMINCDIR = -I/usr/X11R6/include
- 
-      XPMDEFINES = -DXPM
-          XPMLIB = $(XPMLIBDIR) -lXpm
diff --git a/x11/ctwm/patches/patch-gram.y b/x11/ctwm/patches/patch-gram.y
new file mode 100644
index 00000000000..5ba052c1e50
--- /dev/null
+++ b/x11/ctwm/patches/patch-gram.y
@@ -0,0 +1,54 @@
+--- gram.y.orig	Tue Dec 11 15:38:52 2001
++++ gram.y	Fri Jul  5 15:10:02 2002
+@@ -419,7 +419,6 @@
+ 		| WINDOW_RING		{ list = &Scr->WindowRingL; }
+ 		  win_list
+ 		| WINDOW_RING           { Scr->WindowRingAll = TRUE; }
+-		;
+ 		| WINDOW_RING_EXCLUDE    { if (!Scr->WindowRingL)
+ 		                              Scr->WindowRingAll = TRUE;
+ 		                          list = &Scr->WindowRingExcludeL; }
+@@ -427,6 +426,7 @@
+ 
+ 		| WINDOW_GEOMETRIES 	 {  }
+ 		  wingeom_list
++		;
+ 
+ noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
+ 					    twmrc_error_prefix();
+@@ -683,8 +683,8 @@
+ 		| 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 @@
+ occupy_workspc_entry	: string {
+ 				AddToClientsList ($1, client);
+ 			  }
++			;
+ 
+ occupy_window_list	: LB occupy_window_entries RB {}
+ 			;
+@@ -845,6 +846,7 @@
+ occupy_window_entry	: string {
+ 				AddToClientsList (workspace, $1);
+ 			  }
++			;
+ 
+ icon_list	: LB icon_entries RB {}
+ 		;
+@@ -962,6 +964,8 @@
+ 					  RemoveDQuote(ptr);
+ 					  $$ = (unsigned char*)ptr;
+ 					}
++		;
++
+ number		: NUMBER		{ $$ = $1; }
+ 		;
+ 
diff --git a/x11/ctwm/patches/patch-ab b/x11/ctwm/patches/patch-session.c
similarity index 83%
rename from x11/ctwm/patches/patch-ab
rename to x11/ctwm/patches/patch-session.c
index 915d7057d4d..4b9afbfd9ae 100644
--- a/x11/ctwm/patches/patch-ab
+++ b/x11/ctwm/patches/patch-session.c
@@ -1,6 +1,6 @@
---- session.c.orig	Mon Jul 10 23:56:53 2000
-+++ session.c	Tue Jul 11 00:01:33 2000
-@@ -887,6 +887,7 @@
+--- session.c.orig	Tue Dec 11 15:38:52 2001
++++ session.c	Fri Jul  5 14:36:25 2002
+@@ -892,6 +892,7 @@
      return found;
  }
  
@@ -8,16 +8,16 @@
  /*===[ Unique Filename Generator ]===========================================*/
  
  static char *
-@@ -917,6 +918,7 @@
+@@ -922,6 +923,7 @@
  #endif
  }
  
 +#endif /* ! __OpenBSD__ */
  /*===[ SAVE WINDOW INFORMATION ]=============================================*/
  
- void
-@@ -942,6 +944,10 @@
-     char discardCommand[80];
+ #ifndef PATH_MAX
+@@ -951,6 +953,10 @@
+     char discardCommand[PATH_MAX + 4];
      int numVals, i;
      char yes = 1;
 +#ifdef __OpenBSD__
@@ -27,7 +27,7 @@
      static int first_time = 1;
  
      if (first_time)
-@@ -994,12 +1000,20 @@
+@@ -1003,12 +1009,20 @@
       *        no longer the same since the new format supports
       *        virtaul workspaces.
       *========================================================*/
diff --git a/x11/ctwm/pkg/PLIST b/x11/ctwm/pkg/PLIST
index fcea27f2f8c..7f47f0b0225 100644
--- a/x11/ctwm/pkg/PLIST
+++ b/x11/ctwm/pkg/PLIST
@@ -1,95 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/07/10 08:38:12 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/07/05 07:21:54 kevlo Exp $
 bin/ctwm
 lib/X11/twm/system.ctwmrc
-lib/X11/twm/images/3D_Expand15.xpm
-lib/X11/twm/images/3D_Iconify15.xpm
-lib/X11/twm/images/3D_Lightning15.xpm
-lib/X11/twm/images/3D_Menu15.xpm
-lib/X11/twm/images/3D_Resize15.xpm
-lib/X11/twm/images/3D_Zoom15.xpm
-lib/X11/twm/images/3dcircle.xpm
-lib/X11/twm/images/3ddimple.xpm
-lib/X11/twm/images/3ddot.xpm
-lib/X11/twm/images/3dfeet.xpm
-lib/X11/twm/images/3dleopard.xpm
-lib/X11/twm/images/3dpie.xpm
-lib/X11/twm/images/3dpyramid.xpm
-lib/X11/twm/images/3dslant.xpm
-lib/X11/twm/images/IslandD.xpm
-lib/X11/twm/images/IslandW.xpm
-lib/X11/twm/images/LRom.xpm
-lib/X11/twm/images/LRom1.xpm
-lib/X11/twm/images/arthur.xpm
-lib/X11/twm/images/audio_editor.xpm
-lib/X11/twm/images/background8.xpm
-lib/X11/twm/images/ball1.xpm
-lib/X11/twm/images/ball10.xpm
-lib/X11/twm/images/ball11.xpm
-lib/X11/twm/images/ball12.xpm
-lib/X11/twm/images/ball2.xpm
-lib/X11/twm/images/ball3.xpm
-lib/X11/twm/images/ball4.xpm
-lib/X11/twm/images/ball5.xpm
-lib/X11/twm/images/ball6.xpm
-lib/X11/twm/images/ball7.xpm
-lib/X11/twm/images/ball8.xpm
-lib/X11/twm/images/ball9.xpm
-lib/X11/twm/images/cdrom1.xpm
-lib/X11/twm/images/claude.xpm
-lib/X11/twm/images/clipboard.xpm
-lib/X11/twm/images/datebook.xpm
-lib/X11/twm/images/emacs.xpm
-lib/X11/twm/images/ghostview.xpm
-lib/X11/twm/images/gnu-emacs1.xpm
-lib/X11/twm/images/gnu-emacs2.xpm
-lib/X11/twm/images/gnu-emacs3.xpm
-lib/X11/twm/images/gnu-emacs4.xpm
-lib/X11/twm/images/gnu-emacs5.xpm
-lib/X11/twm/images/gnu-emacs6.xpm
-lib/X11/twm/images/gnu-emacs7.xpm
-lib/X11/twm/images/hpterm.xpm
-lib/X11/twm/images/mail0.xpm
-lib/X11/twm/images/mail1.xpm
-lib/X11/twm/images/nothing.xpm
-lib/X11/twm/images/nt1.xpm
-lib/X11/twm/images/nt2.xpm
-lib/X11/twm/images/pixmap.xpm
-lib/X11/twm/images/postit.xpm
-lib/X11/twm/images/skull.xpm
-lib/X11/twm/images/spider.xpm
-lib/X11/twm/images/supman1.xbm
-lib/X11/twm/images/supman2.xbm
-lib/X11/twm/images/supman3.xbm
-lib/X11/twm/images/supman4.xbm
-lib/X11/twm/images/supman5.xbm
-lib/X11/twm/images/supman6.xbm
-lib/X11/twm/images/supman7.xbm
-lib/X11/twm/images/supman8.xbm
-lib/X11/twm/images/supman9.xbm
-lib/X11/twm/images/term.xpm
-lib/X11/twm/images/unknown.xpm
-lib/X11/twm/images/unknown1.xpm
-lib/X11/twm/images/unread.xpm
-lib/X11/twm/images/welcome.xpm
-lib/X11/twm/images/welcome.xwd
-lib/X11/twm/images/xarchie.xpm
-lib/X11/twm/images/xcalc.xpm
-lib/X11/twm/images/xcalc2.xpm
-lib/X11/twm/images/xedit.xpm
-lib/X11/twm/images/xftp.xpm
-lib/X11/twm/images/xgopher.xpm
-lib/X11/twm/images/xgrab.xpm
-lib/X11/twm/images/xhpcalc.xpm
-lib/X11/twm/images/xirc.xpm
-lib/X11/twm/images/xmail.xpm
-lib/X11/twm/images/xman.xpm
-lib/X11/twm/images/xmosaic.xpm
-lib/X11/twm/images/xnomail.xpm
-lib/X11/twm/images/xrn-compose.xpm
-lib/X11/twm/images/xrn.goodnews.xpm
-lib/X11/twm/images/xrn.nonews.xpm
-lib/X11/twm/images/xrn.xpm
-lib/X11/twm/images/xterm.xpm
 man/cat1/ctwm.0
-@dirrm lib/X11/twm/images
 @dirrm lib/X11/twm