diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index 15264651cd6..843f2d1d66b 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2008/05/19 07:43:42 bernd Exp $
+# $OpenBSD: Makefile,v 1.16 2009/03/11 21:20:27 avsm Exp $
 
 # until tested on others, even though bytecode is produced
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
 COMMENT=	framework for analysis and transformation of C
 
-DISTNAME=	cil-1.3.5
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	cil-1.3.6
 CATEGORIES=	devel lang
 MASTER_SITES=	http://manju.cs.berkeley.edu/cil/distrib/
 
@@ -25,8 +24,8 @@ WRKDIST=	${WRKDIR}/cil
 
 OURFILES=	nullint kerneltrace randomvars
 
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.52
+CONFIGURE_STYLE= autoconf no-autoheader
+AUTOCONF_VERSION= 2.61
 USE_GMAKE= yes
 ALL_TARGET= setup
 CONFIGURE_ARGS= EXTRAFEATURES="${OURFILES}"
diff --git a/devel/cil/distinfo b/devel/cil/distinfo
index 4df834e45fd..6d55c85fe85 100644
--- a/devel/cil/distinfo
+++ b/devel/cil/distinfo
@@ -1,5 +1,5 @@
-MD5 (cil-1.3.5.tar.gz) = Ym/c+jEcMSYv0saCXwgRHw==
-RMD160 (cil-1.3.5.tar.gz) = Z6y9dxNbM9JCZRestlSIopMaCmQ=
-SHA1 (cil-1.3.5.tar.gz) = Fwwq+rQGRORQo+uxfgYtyhSGfdU=
-SHA256 (cil-1.3.5.tar.gz) = fwbevax7crLHrszlzGmkbx5F35cjp7ksV06DS03oEGk=
-SIZE (cil-1.3.5.tar.gz) = 1139611
+MD5 (cil-1.3.6.tar.gz) = ES37q90OEoCADWK6REmrRQ==
+RMD160 (cil-1.3.6.tar.gz) = 5Q9Kt6rGI6rbWcHlHhKAIm4uteA=
+SHA1 (cil-1.3.6.tar.gz) = tXsI+tJrVKheY8D7be14WDdpOeI=
+SHA256 (cil-1.3.6.tar.gz) = Ocx0Y5hVG0g7PStNkNW9Wq0yb5RrdPzdZ9VDT3x/hU8=
+SIZE (cil-1.3.6.tar.gz) = 1368573
diff --git a/devel/cil/patches/patch-Makefile_in b/devel/cil/patches/patch-Makefile_in
new file mode 100644
index 00000000000..2a3efffe933
--- /dev/null
+++ b/devel/cil/patches/patch-Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2009/03/11 21:20:27 avsm Exp $
+--- Makefile.in.orig	Thu Nov 27 12:50:50 2008
++++ Makefile.in	Thu Nov 27 12:51:41 2008
+@@ -273,7 +273,10 @@ $(OBJDIR)/libperfcount.a: %: %($(OBJDIR)/perfcount.$(C
+ ifeq ($(NATIVECAML),1)
+ $(OBJDIR)/libcil.a: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
+                     $(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO))
+-	ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^
++	ocamlopt -output-obj -o $(OBJDIR)/libcil.o unix.cmxa str.cmxa $^
++	rm -f $@
++	ar rcs $@ $(OBJDIR)/libcil.o
++	rm -f $(OBJDIR)/libcil.o
+ else
+ $(OBJDIR)/libcil.a:
+ 	@echo "Can only build $@ when NATIVECAML is 1."
diff --git a/devel/cil/patches/patch-configure_in b/devel/cil/patches/patch-configure_in
index dd212de4c1c..9e376d2aa95 100644
--- a/devel/cil/patches/patch-configure_in
+++ b/devel/cil/patches/patch-configure_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.6 2006/05/28 15:44:14 avsm Exp $
---- configure.in.orig	Sun May 21 05:14:15 2006
-+++ configure.in	Sat May 27 18:33:20 2006
-@@ -85,7 +85,7 @@ binaryExists() {
+$OpenBSD: patch-configure_in,v 1.7 2009/03/11 21:20:27 avsm Exp $
+--- configure.in.orig	Mon Feb  5 21:10:29 2007
++++ configure.in	Thu Nov 27 12:26:42 2008
+@@ -80,7 +80,7 @@ binaryExists() {
  # this specifies the root of the source tree; it's just the
  # directory where ./configure runs, except on cygwin, which
  # overrides this below
@@ -10,9 +10,9 @@ $OpenBSD: patch-configure_in,v 1.6 2006/05/28 15:44:14 avsm Exp $
  
  DEFAULT_COMPILER=_GNUCC
  DEFAULT_CIL_MODE=GNUCC
-@@ -391,6 +391,13 @@ case "$target" in
-   # linux
-   *86*linux*|*86*freebsd*|*86*openbsd*|*86*darwin*)
+@@ -408,6 +408,13 @@ case "$target" in
+ 
+   *86*linux*)
      AC_MSG_RESULT(configuring for linux/x86)
 +
 +    ARCHOS=x86_LINUX
diff --git a/devel/cil/pkg/PLIST b/devel/cil/pkg/PLIST
index 0d9770a218a..9fdb596dee0 100644
--- a/devel/cil/pkg/PLIST
+++ b/devel/cil/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2006/05/28 15:44:14 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/03/11 21:20:27 avsm Exp $
 bin/cilly
 bin/patcher
 lib/cil/
@@ -29,6 +29,7 @@ lib/cil/growArray.cmi
 lib/cil/inthash.cmi
 lib/cil/libperfcount.a
 lib/cil/logcalls.cmi
+lib/cil/longarray.cmi
 lib/cil/mergecil.cmi
 lib/cil/olf.cmi
 lib/cil/oneret.cmi
@@ -42,6 +43,7 @@ lib/cil/stats.cmi
 lib/cil/trace.cmi
 lib/cil/uref.cmi
 lib/cil/util.cmi
+lib/cil/whitetrack.cmi
 ${P5SITE}/CIL/
 ${P5SITE}/CIL/Cilly.pm
 ${P5SITE}/CIL/KeptFile.pm
@@ -49,9 +51,9 @@ ${P5SITE}/CIL/OutputFile.pm
 ${P5SITE}/CIL/TempFile.pm
 ${P5SITE}/CilConfig.pm
 libexec/cil/
-libexec/cil/cilly.asm.exe
-libexec/cil/cilly.byte.exe
-libexec/cil/machdep.exe
+@bin libexec/cil/cilly.asm.exe
+@bin libexec/cil/cilly.byte.exe
+@bin libexec/cil/machdep.exe
 @comment share/cil/
 @comment share/cil/Cilly.pm
 @comment share/cil/KeptFile.pm