diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index f143e051300b..2a0f6a9714fa 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -1,26 +1,26 @@
 # New ports collection makefile for:	ctwm
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ctwm
-PORTVERSION=	3.5.2c
+PORTVERSION=	3.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://slpc1.epfl.ch/public/software/ctwm/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		ctwm.1
 
 post-extract:
 	@(cd ${WRKSRC} && ${LN} -s ../xpm xpm)
 
 .include <bsd.port.mk>
diff --git a/x11-wm/ctwm/distinfo b/x11-wm/ctwm/distinfo
index ffe97a1536dc..78481e375ae3 100644
--- a/x11-wm/ctwm/distinfo
+++ b/x11-wm/ctwm/distinfo
@@ -1,2 +1,2 @@
-MD5 (ctwm-3.5.2c.tar.gz) = dd8d88639422e797fb77789f69cafab2
+MD5 (ctwm-3.6.tar.gz) = c9e9e161e07e3d1c7e27684436f01e2b
 MD5 (ctwm-images.tar.gz) = 4b0c784213af4afa2d736773863e53b4
diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa
index f0cffd45a747..2aecdda66553 100644
--- a/x11-wm/ctwm/files/patch-aa
+++ b/x11-wm/ctwm/files/patch-aa
@@ -1,60 +1,45 @@
+$FreeBSD$
+
 *** Imakefile.orig	Mon May 15 21:47:10 2000
 --- Imakefile	Sat Sep 22 11:50:14 2001
 ***************
-*** 11,17 ****
-  #undef  USE_SOUND
-  #define XPM
-  #define USEM4
-! #undef X11R6
-  #define I18N
-  
-           YFLAGS = -d
---- 11,17 ----
-  #undef  USE_SOUND
-  #define XPM
-  #define USEM4
-! #define X11R6
-  #define I18N
-  
-           YFLAGS = -d
-***************
 *** 19,26 ****
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM
 !       XPMLIBDIR = 
 !       XPMINCDIR = 
   
        XPMDEFINES = -DXPM
            XPMLIB = $(XPMLIBDIR) -lXpm
 --- 19,26 ----
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM
 !       XPMLIBDIR = -L$(USRLIBDIR)
 !       XPMINCDIR = -I$(INCROOT)
   
        XPMDEFINES = -DXPM
            XPMLIB = $(XPMLIBDIR) -lXpm
 ***************
 *** 44,52 ****
   #endif
   
   #ifdef USEM4
      M4LIBDIR =
      M4INCDIR =
 !   M4DEFINES = -DUSEM4
         M4LIB = $(M4LIBDIR)
   #else
      M4LIBDIR = 
 --- 44,53 ----
   #endif
   
   #ifdef USEM4
 +      M4PROG = ${LOCALBASE}/bin/gm4
      M4LIBDIR =
      M4INCDIR =
 !   M4DEFINES = -DUSEM4 -DM4PROG=\"${M4PROG}\"
         M4LIB = $(M4LIBDIR)
   #else
      M4LIBDIR = 
diff --git a/x11-wm/ctwm/files/patch-ac b/x11-wm/ctwm/files/patch-ac
new file mode 100644
index 000000000000..75c519283b4f
--- /dev/null
+++ b/x11-wm/ctwm/files/patch-ac
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- gram.y.orig	Thu Aug  8 15:45:21 2002
++++ gram.y	Thu Aug  8 15:45:31 2002
+@@ -683,7 +683,7 @@
+ 		| wingeom_entries wingeom_entry
+ 		;
+ 
+-wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2) }
++wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2); }
+ 
+ 
+