diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index e2e73630fb7d..e1dbb0847b5d 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -14,6 +14,11 @@ MASTER_SITE_SUBDIR=	geekcode
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Geek Code Generator
 
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+
+PLIST_FILES=	bin/geekcode
+PORTDOCS=	geekcode.txt
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/geekcode ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
diff --git a/misc/geekcode/files/patch-aa b/misc/geekcode/files/patch-aa
deleted file mode 100644
index f2bae7993e6d..000000000000
--- a/misc/geekcode/files/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig	Mon Feb 21 20:49:20 2000
-+++ Makefile	Mon Feb 21 20:49:41 2000
-@@ -1,6 +1,4 @@
--CFLAGS=-O3 -s
- TARGET=geekcode
--CC=gcc
- 
- SRCFILES = gc_appearance.c    \
-            gc_computers.c     \
diff --git a/misc/geekcode/pkg-plist b/misc/geekcode/pkg-plist
deleted file mode 100644
index 968a55e9447e..000000000000
--- a/misc/geekcode/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/geekcode
-%%PORTDOCS%%%%DOCSDIR%%/geekcode.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%