diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
new file mode 100644
index 00000000000..d13671beac8
--- /dev/null
+++ b/x11/gromit/Makefile
@@ -0,0 +1,43 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2005/06/15 17:30:20 niallo Exp $
+
+COMMENT=		"small tool to make annotations on the screen"
+
+DISTNAME=		gromit-20041213
+CATEGORIES=		x11
+
+HOMEPAGE=		http://www.home.unix-ag.org/simon/gromit/
+
+MAINTAINER=		Michael Knudsen <mk@molioner.dk>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MODULES=		devel/gettext
+
+WANTLIB=		Xrender c freetype X11 m Xft fontconfig atk-1.0.0.0 \
+			glib-2.0.0.0 gobject-2.0.0.0 gmodule-2.0.0.0 \
+			pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
+			
+
+MASTER_SITES=		${HOMEPAGE}
+
+LIB_DEPENDS=	gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
+BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig \
+		${LIB_DEPENDS}
+	
+
+NO_REGRESS=		Yes
+
+DOCDIR=			${PREFIX}/share/doc/gromit/
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gromit ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/gromitrc ${DOCDIR}
+
+.include <bsd.port.mk>
+
diff --git a/x11/gromit/distinfo b/x11/gromit/distinfo
new file mode 100644
index 00000000000..258d8fdeec7
--- /dev/null
+++ b/x11/gromit/distinfo
@@ -0,0 +1,4 @@
+MD5 (gromit-20041213.tar.gz) = 86fd67cfe62b1b955ddcd821e14a8c14
+RMD160 (gromit-20041213.tar.gz) = e20e1cea9fb5245143f0dd24b209cc17d3becd3f
+SHA1 (gromit-20041213.tar.gz) = f83bdadc90988634a27865eac5da9e847febec37
+SIZE (gromit-20041213.tar.gz) = 21970
diff --git a/x11/gromit/patches/patch-Makefile b/x11/gromit/patches/patch-Makefile
new file mode 100644
index 00000000000..2c4a86ed377
--- /dev/null
+++ b/x11/gromit/patches/patch-Makefile
@@ -0,0 +1,17 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2005/06/15 17:30:20 niallo Exp $
+--- Makefile.orig	Wed Jun  8 02:31:18 2005
++++ Makefile	Wed Jun  8 02:32:18 2005
+@@ -1,10 +1,10 @@
+ all: gromit
+ 
+ proptest: proptest.c
+-	gcc -o proptest proptest.c `gtk-config --libs --cflags`
++	${CC} ${CFLAGS} -o proptest proptest.c `gtk-config --libs --cflags`
+ 
+ propertywatch: propertywatch.c
+-	gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags`
++	${CC} ${CFLAGS} -o propertywatch propertywatch.c `gtk-config --libs --cflags`
+ 
+ gromit: gromit.c Makefile
+-	gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0`
++	${CC} ${CFLAGS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0`
diff --git a/x11/gromit/pkg/DESCR b/x11/gromit/pkg/DESCR
new file mode 100644
index 00000000000..917f54e6f57
--- /dev/null
+++ b/x11/gromit/pkg/DESCR
@@ -0,0 +1,5 @@
+Gromit (GRaphics Over MIscellaneous Things) is a small tool to make
+annotations on the screen. It is particularly useful when making
+presentations of programs to highlight certain features or screen
+elements.
+
diff --git a/x11/gromit/pkg/PLIST b/x11/gromit/pkg/PLIST
new file mode 100644
index 00000000000..dd1a592f6e3
--- /dev/null
+++ b/x11/gromit/pkg/PLIST
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/15 17:30:20 niallo Exp $
+bin/gromit
+share/doc/gromit/
+share/doc/gromit/README
+share/doc/gromit/gromitrc