diff --git a/devel/gmc4cc/Makefile b/devel/gmc4cc/Makefile
index 6bec75dd0c2..52dac3e8a34 100644
--- a/devel/gmc4cc/Makefile
+++ b/devel/gmc4cc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2011/12/27 21:16:03 kili Exp $
+# $OpenBSD: Makefile,v 1.4 2012/09/02 21:54:08 kili Exp $
 
 COMMENT=	C compiler for GMC-4
 
 DISTNAME=	gmc4cc-0.6.2
 CATEGORIES=	devel lang
 
-REVISION=	1
+REVISION=	2
 
 # Japanese, use this for the English version: http://goo.gl/LPtgg
 HOMEPAGE=	http://terus.jp/engineering/gmc4cc/
@@ -26,7 +26,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MODULES=	converters/libiconv
 
-WANTLIB += c gmp m pthread util
+WANTLIB += c gmp m
 
 BUILD_DEPENDS=	lang/ghc
 LIB_DEPENDS=	devel/gmp
diff --git a/devel/gmc4cc/patches/patch-Assembler_hs b/devel/gmc4cc/patches/patch-Assembler_hs
new file mode 100644
index 00000000000..4f2418a3bbe
--- /dev/null
+++ b/devel/gmc4cc/patches/patch-Assembler_hs
@@ -0,0 +1,11 @@
+$OpenBSD: patch-Assembler_hs,v 1.1 2012/09/02 21:54:08 kili Exp $
+--- Assembler.hs.orig	Thu Jul 23 09:52:53 2009
++++ Assembler.hs	Fri Jul 13 14:27:41 2012
+@@ -1,6 +1,6 @@
+ module Assembler where
+ 
+-import Char
++import Data.Char
+ 
+ import Lexer
+ import Instruction
diff --git a/devel/gmc4cc/patches/patch-AssemblyParser_hs b/devel/gmc4cc/patches/patch-AssemblyParser_hs
new file mode 100644
index 00000000000..01b3f3c8039
--- /dev/null
+++ b/devel/gmc4cc/patches/patch-AssemblyParser_hs
@@ -0,0 +1,13 @@
+$OpenBSD: patch-AssemblyParser_hs,v 1.1 2012/09/02 21:54:08 kili Exp $
+--- AssemblyParser.hs.orig	Thu Jul 23 07:47:44 2009
++++ AssemblyParser.hs	Fri Jul 13 14:27:24 2012
+@@ -1,7 +1,7 @@
+ module AssemblyParser where
+ 
+-import Char
+-import List
++import Data.Char
++import Data.List
+ 
+ import Lexer
+ import Instruction
diff --git a/devel/gmc4cc/patches/patch-Emitter_hs b/devel/gmc4cc/patches/patch-Emitter_hs
new file mode 100644
index 00000000000..8bf3a798eb2
--- /dev/null
+++ b/devel/gmc4cc/patches/patch-Emitter_hs
@@ -0,0 +1,11 @@
+$OpenBSD: patch-Emitter_hs,v 1.1 2012/09/02 21:54:08 kili Exp $
+--- Emitter.hs.orig	Thu Jul 23 17:38:50 2009
++++ Emitter.hs	Fri Jul 13 14:27:57 2012
+@@ -1,6 +1,6 @@
+ module Emitter where
+ 
+-import List
++import Data.List
+ 
+ import Lexer
+ import Parser
diff --git a/devel/gmc4cc/patches/patch-Lexer_hs b/devel/gmc4cc/patches/patch-Lexer_hs
new file mode 100644
index 00000000000..a8779a89069
--- /dev/null
+++ b/devel/gmc4cc/patches/patch-Lexer_hs
@@ -0,0 +1,13 @@
+$OpenBSD: patch-Lexer_hs,v 1.1 2012/09/02 21:54:08 kili Exp $
+--- Lexer.hs.orig	Thu Jul 23 09:03:44 2009
++++ Lexer.hs	Fri Jul 13 14:26:49 2012
+@@ -1,7 +1,7 @@
+ module Lexer where
+ 
+-import Char
+-import List
++import Data.Char
++import Data.List
+ 
+ data Token =
+     TokenIdentifier String |
diff --git a/devel/gmc4cc/patches/patch-Main_hs b/devel/gmc4cc/patches/patch-Main_hs
new file mode 100644
index 00000000000..ba7afe67024
--- /dev/null
+++ b/devel/gmc4cc/patches/patch-Main_hs
@@ -0,0 +1,9 @@
+$OpenBSD: patch-Main_hs,v 1.1 2012/09/02 21:54:08 kili Exp $
+--- Main.hs.orig	Sun Jul 19 12:41:15 2009
++++ Main.hs	Fri Jul 13 14:28:12 2012
+@@ -1,4 +1,4 @@
+-import System
++import System.Environment
+ 
+ import Lexer
+ import Parser