diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index a9a65e35315f..caa3e2ede243 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -26,14 +26,10 @@ DISTFILES=	${SRC_DIST}
 DISTFILES+=	${BOOT_DIST}
 .else
 DISTFILES+=	${BOOT_DIST5}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs \
-		${FILESDIR}/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs \
-		${FILESDIR}/extra-patch-ghc-rts-RtsFlags.c \
-		${FILESDIR}/extra-patch-ghc-rts-rts.conf.in \
-		${FILESDIR}/extra-patch-ghc-utils-prof-cgprof-cgprof.c
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 .endif
 
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+
 MAINTAINER=	simonmar@microsoft.com
 COMMENT=	A Compiler for the functional language Haskell
 
@@ -54,16 +50,11 @@ PLIST_SUB+=	PROFILE=""
 BOOT_DIR=	${WRKDIR}/ghc-${PORTVERSION}-boot
 BOOT_GHC=	${BOOT_DIR}/bin/i386-unknown-freebsd/ghc-${PORTVERSION}
 
-CONFIGURE_ARGS= --with-ghc=${BOOT_GHC}
+CONFIGURE_ARGS= --with-ghc=${BOOT_GHC}  --with-gcc=${CC}
 # specifying CONFIGURE_TARGET doesn't work for some reason.
 CONFIGURE_TARGET=
 # libgmp:
-.if ${OSVERSION} >= 500000
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
-PLIST_SUB+=	GMP="@comment "
-.else
-PLIST_SUB+=	GMP=""
-.endif
 
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
@@ -83,9 +74,7 @@ post-extract:
 .if defined(WITHOUT_PROFILE)
 	@${ECHO} >>${WRKSRC}/mk/build.mk GhcLibWays=
 .endif
-.if ${OSVERSION} >= 500000
 	@${ECHO} >>${WRKSRC}/mk/build.mk SplitObjs=NO
-.endif
 
 post-patch:
 	@${PERL} -pi -e 's/DrIFT/DrIFT-ghc/g; \
diff --git a/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs b/lang/ghc/files/patch-ghc-compiler-nativeGen-MachMisc.lhs
similarity index 100%
rename from lang/ghc/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs
rename to lang/ghc/files/patch-ghc-compiler-nativeGen-MachMisc.lhs
diff --git a/lang/ghc/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs b/lang/ghc/files/patch-ghc-compiler-nativeGen-RegAllocInfo.lhs
similarity index 100%
rename from lang/ghc/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs
rename to lang/ghc/files/patch-ghc-compiler-nativeGen-RegAllocInfo.lhs
diff --git a/lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c b/lang/ghc/files/patch-ghc-rts-RtsFlags.c
similarity index 100%
rename from lang/ghc/files/extra-patch-ghc-rts-RtsFlags.c
rename to lang/ghc/files/patch-ghc-rts-RtsFlags.c
diff --git a/lang/ghc/files/extra-patch-ghc-rts-rts.conf.in b/lang/ghc/files/patch-ghc-rts-rts.conf.in
similarity index 100%
rename from lang/ghc/files/extra-patch-ghc-rts-rts.conf.in
rename to lang/ghc/files/patch-ghc-rts-rts.conf.in
diff --git a/lang/ghc/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c b/lang/ghc/files/patch-ghc-utils-prof-cgprof-cgprof.c
similarity index 100%
rename from lang/ghc/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c
rename to lang/ghc/files/patch-ghc-utils-prof-cgprof-cgprof.c
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index 693670d3acd8..83b326a862ab 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -819,7 +819,6 @@ lib/ghc-%%GHC_VERSION%%/libHStext_cbits.a
 lib/ghc-%%GHC_VERSION%%/libHSutil.a
 lib/ghc-%%GHC_VERSION%%/libHSutil_cbits.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSutil_p.a
-%%GMP%%lib/ghc-%%GHC_VERSION%%/libgmp.a
 lib/ghc-%%GHC_VERSION%%/package.conf
 lib/ghc-%%GHC_VERSION%%/parse-gcstats.prl
 lib/ghc-%%GHC_VERSION%%/process-gcstats.prl
diff --git a/lang/ghc5/Makefile b/lang/ghc5/Makefile
index a9a65e35315f..caa3e2ede243 100644
--- a/lang/ghc5/Makefile
+++ b/lang/ghc5/Makefile
@@ -26,14 +26,10 @@ DISTFILES=	${SRC_DIST}
 DISTFILES+=	${BOOT_DIST}
 .else
 DISTFILES+=	${BOOT_DIST5}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs \
-		${FILESDIR}/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs \
-		${FILESDIR}/extra-patch-ghc-rts-RtsFlags.c \
-		${FILESDIR}/extra-patch-ghc-rts-rts.conf.in \
-		${FILESDIR}/extra-patch-ghc-utils-prof-cgprof-cgprof.c
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 .endif
 
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+
 MAINTAINER=	simonmar@microsoft.com
 COMMENT=	A Compiler for the functional language Haskell
 
@@ -54,16 +50,11 @@ PLIST_SUB+=	PROFILE=""
 BOOT_DIR=	${WRKDIR}/ghc-${PORTVERSION}-boot
 BOOT_GHC=	${BOOT_DIR}/bin/i386-unknown-freebsd/ghc-${PORTVERSION}
 
-CONFIGURE_ARGS= --with-ghc=${BOOT_GHC}
+CONFIGURE_ARGS= --with-ghc=${BOOT_GHC}  --with-gcc=${CC}
 # specifying CONFIGURE_TARGET doesn't work for some reason.
 CONFIGURE_TARGET=
 # libgmp:
-.if ${OSVERSION} >= 500000
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
-PLIST_SUB+=	GMP="@comment "
-.else
-PLIST_SUB+=	GMP=""
-.endif
 
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
@@ -83,9 +74,7 @@ post-extract:
 .if defined(WITHOUT_PROFILE)
 	@${ECHO} >>${WRKSRC}/mk/build.mk GhcLibWays=
 .endif
-.if ${OSVERSION} >= 500000
 	@${ECHO} >>${WRKSRC}/mk/build.mk SplitObjs=NO
-.endif
 
 post-patch:
 	@${PERL} -pi -e 's/DrIFT/DrIFT-ghc/g; \
diff --git a/lang/ghc5/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs b/lang/ghc5/files/patch-ghc-compiler-nativeGen-MachMisc.lhs
similarity index 100%
rename from lang/ghc5/files/extra-patch-ghc-compiler-nativeGen-MachMisc.lhs
rename to lang/ghc5/files/patch-ghc-compiler-nativeGen-MachMisc.lhs
diff --git a/lang/ghc5/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs b/lang/ghc5/files/patch-ghc-compiler-nativeGen-RegAllocInfo.lhs
similarity index 100%
rename from lang/ghc5/files/extra-patch-ghc-compiler-nativeGen-RegAllocInfo.lhs
rename to lang/ghc5/files/patch-ghc-compiler-nativeGen-RegAllocInfo.lhs
diff --git a/lang/ghc5/files/extra-patch-ghc-rts-RtsFlags.c b/lang/ghc5/files/patch-ghc-rts-RtsFlags.c
similarity index 100%
rename from lang/ghc5/files/extra-patch-ghc-rts-RtsFlags.c
rename to lang/ghc5/files/patch-ghc-rts-RtsFlags.c
diff --git a/lang/ghc5/files/extra-patch-ghc-rts-rts.conf.in b/lang/ghc5/files/patch-ghc-rts-rts.conf.in
similarity index 100%
rename from lang/ghc5/files/extra-patch-ghc-rts-rts.conf.in
rename to lang/ghc5/files/patch-ghc-rts-rts.conf.in
diff --git a/lang/ghc5/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c b/lang/ghc5/files/patch-ghc-utils-prof-cgprof-cgprof.c
similarity index 100%
rename from lang/ghc5/files/extra-patch-ghc-utils-prof-cgprof-cgprof.c
rename to lang/ghc5/files/patch-ghc-utils-prof-cgprof-cgprof.c
diff --git a/lang/ghc5/pkg-plist b/lang/ghc5/pkg-plist
index 693670d3acd8..83b326a862ab 100644
--- a/lang/ghc5/pkg-plist
+++ b/lang/ghc5/pkg-plist
@@ -819,7 +819,6 @@ lib/ghc-%%GHC_VERSION%%/libHStext_cbits.a
 lib/ghc-%%GHC_VERSION%%/libHSutil.a
 lib/ghc-%%GHC_VERSION%%/libHSutil_cbits.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSutil_p.a
-%%GMP%%lib/ghc-%%GHC_VERSION%%/libgmp.a
 lib/ghc-%%GHC_VERSION%%/package.conf
 lib/ghc-%%GHC_VERSION%%/parse-gcstats.prl
 lib/ghc-%%GHC_VERSION%%/process-gcstats.prl