diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index 048b3d9e709..4a846382afd 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2005/10/28 19:43:32 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2007/08/25 08:03:43 espie Exp $
 
-COMMENT=	"advanced lint: statically check C programs"
-DISTNAME=	splint-3.1.1
-PKGNAME=	${DISTNAME}p0
+COMMENT=	advanced lint: statically check C programs
+DISTNAME=	splint-3.1.2
+DISTFILES=	splint-3.1.2.src.tgz
+PKGNAME=	${DISTNAME}
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.splint.org/
diff --git a/devel/splint/distinfo b/devel/splint/distinfo
index f37f4999d98..1b0c985af6c 100644
--- a/devel/splint/distinfo
+++ b/devel/splint/distinfo
@@ -1,5 +1,5 @@
-MD5 (splint-3.1.1.tar.gz) = kWNdmGRDEjAvbxar5zwkdA==
-RMD160 (splint-3.1.1.tar.gz) = ig0EsgzN/VD5nj72q9WeeyWBSRI=
-SHA1 (splint-3.1.1.tar.gz) = EZLo8Y6O9j/cegsPomw1tG1Z5OY=
-SHA256 (splint-3.1.1.tar.gz) = QQs0iQxjRo6e4jj/Zh2MbxRchwiyrzA+625+li6PVNY=
-SIZE (splint-3.1.1.tar.gz) = 2425108
+MD5 (splint-3.1.2.src.tgz) = JfR9cL2ci93fawPeWUnE/Q==
+RMD160 (splint-3.1.2.src.tgz) = Uul4bTy+qkN4d6M7GOQrMt/zuWs=
+SHA1 (splint-3.1.2.src.tgz) = DfSJyyKNz/+xSbOMV2FMLD4gBQE=
+SHA256 (splint-3.1.2.src.tgz) = x422Q99mMxPj+p1WURg5GCXdk3YXgZxu/HlmzfRE+wo=
+SIZE (splint-3.1.2.src.tgz) = 2284033
diff --git a/devel/splint/patches/patch-src_Makefile_in b/devel/splint/patches/patch-src_Makefile_in
index 7667d1a7cb0..557fa52be27 100644
--- a/devel/splint/patches/patch-src_Makefile_in
+++ b/devel/splint/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/05/23 15:41:07 sturm Exp $
---- src/Makefile.in.orig	2004-05-23 12:39:59.000000000 +0200
-+++ src/Makefile.in	2004-05-23 12:40:14.000000000 +0200
-@@ -1156,7 +1156,6 @@ up: 
+$OpenBSD: patch-src_Makefile_in,v 1.2 2007/08/25 08:03:43 espie Exp $
+--- src/Makefile.in.orig	Fri Jul 13 23:42:42 2007
++++ src/Makefile.in	Tue Aug 14 20:01:44 2007
+@@ -1159,7 +1159,6 @@ up: 
  	$(MAKE) clean
  
  .c.o:
diff --git a/devel/splint/patches/patch-src_cgrammar_y b/devel/splint/patches/patch-src_cgrammar_y
deleted file mode 100644
index 8e227ef8c7a..00000000000
--- a/devel/splint/patches/patch-src_cgrammar_y
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_cgrammar_y,v 1.1 2005/10/28 19:43:32 espie Exp $
---- src/cgrammar.y.orig	Fri Oct 28 21:30:19 2005
-+++ src/cgrammar.y	Fri Oct 28 21:30:34 2005
-@@ -218,7 +218,7 @@ extern void yyerror (char *);
- %type <entry> endIter 
- 
- %type <funcclauselist> functionClauses functionClausesPlain
--%type <funcclause> functionClause functionClause functionClausePlain
-+%type <funcclause> functionClause functionClausePlain
- 
- %type <globsclause> globalsClause globalsClausePlain
- %type <modsclause> modifiesClause modifiesClausePlain nomodsClause