diff --git a/x11/girara/Makefile b/x11/girara/Makefile
@@ -0,0 +1,42 @@
+# $OpenBSD: Makefile.template,v 1.60 2010/10/24 20:41:23 ajacoutot Exp $
+
+COMMENT =		user interface library from pwmt
+DISTNAME =		girara-0.1.3
+
+GIRARA_SOMAJOR = 0
+GIRARA_SOMINOR = 0
+SHARED_LIBS +=		girara-gtk2 ${GIRARA_SOMAJOR}.${GIRARA_SOMINOR} # 1.0
+
+CATEGORIES =		x11
+HOMEPAGE =		http://pwmt.org/projects/girara/
+
+# zlib
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+MASTER_SITES =		http://pwmt.org/projects/girara/download/
+
+LIB_DEPENDS =		x11/gtk+2
+
+WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pixman-1 png pthread-stubs xcb xcb-render xcb-shm z
+
+USE_GMAKE =	Yes
+
+MAKE_FLAGS +=	QUIET=
+MAKE_FLAGS +=	SOMAJOR=${GIRARA_SOMAJOR} SOMINOR=${GIRARA_SOMINOR}
+
+FAKE_FLAGS +=	PREFIX=${TRUEPREFIX}
+
+REGRESS_TARGET =	test
+REGRESS_DEPENDS =	devel/check
+REGRESS_FLAGS +=	QUIET=
+REGRESS_FLAGS +=	HOME=${HOME}
+REGRESS_IS_INTERACTIVE =X11
+
+.include <bsd.port.mk>
diff --git a/x11/girara/distinfo b/x11/girara/distinfo
@@ -0,0 +1,5 @@
+MD5 (girara-0.1.3.tar.gz) = YbKlZMG3mxuDGov1F9RkTg==
+RMD160 (girara-0.1.3.tar.gz) = Opqbs4oPAW/MESOPy9DXZ/W3EFs=
+SHA1 (girara-0.1.3.tar.gz) = gT2oAwUsYlXxd53XSZi0SnWYYqo=
+SHA256 (girara-0.1.3.tar.gz) = PMK1Y1akvi9OR2OLaX2DBAiocM836F022dK1kfhnSK8=
+SIZE (girara-0.1.3.tar.gz) = 73711
diff --git a/x11/girara/patches/patch-Makefile b/x11/girara/patches/patch-Makefile
@@ -0,0 +1,39 @@
+$OpenBSD$
+
+Don't symlink libs. Create libs with a correct soname.
+
+--- Makefile.orig	Sat Jun  9 22:37:44 2012
++++ Makefile	Tue Jul 10 18:30:00 2012
+@@ -55,7 +55,7 @@ lib${PROJECT}.a: ${OBJECTS}
+
+ lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
+ 	$(ECHO) LD $@
+-	$(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR} -shared ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
++	$(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR}.${SOMINOR} -shared ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
+
+ clean:
+ 	$(QUIET)rm -rf ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
+@@ -73,7 +73,7 @@ lib${PROJECT}-debug.a: ${DOBJECTS}
+
+ lib${PROJECT}-debug.so.${SOVERSION}: ${DOBJECTS}
+ 	$(ECHO) LD $@
+-	$(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR} -shared ${LDFLAGS} -o $@ ${DOBJECTS} ${LIBS}
++	$(QUIET)${CC} -Wl,-soname,lib${PROJECT}.so.${SOMAJOR}.${SOMINOR} -shared ${LDFLAGS} -o $@ ${DOBJECTS} ${LIBS}
+
+ debug: options ${PROJECT}-debug
+
+@@ -124,10 +124,10 @@ install: all install-headers
+ 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
+ 	$(QUIET)install -m 644 lib${PROJECT}.a ${DESTDIR}${LIBDIR}
+ 	$(QUIET)install -m 644 lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}
+-	$(QUIET)ln -s lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} || \
+-		echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please check if it exists and points to the correct version of lib${PROJECT}.so."
+-	$(QUIET)ln -s lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
+-		echo "Failed to create lib${PROJECT}.so. Please check if it exists and points to the correct version of lib${PROJECT}.so."
++	#$(QUIET)ln -s lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} || \
++	#	echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please check if it exists and points to the correct version of lib${PROJECT}.so."
++	#$(QUIET)ln -s lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
++	#	echo "Failed to create lib${PROJECT}.so. Please check if it exists and points to the correct version of lib${PROJECT}.so."
+ 	$(QUIET)${MAKE} -C po install
+
+ install-headers: version.h ${PROJECT}.pc
diff --git a/x11/girara/pkg/DESCR b/x11/girara/pkg/DESCR
@@ -0,0 +1,10 @@
+Girara is a library that implements a user interface that focuses on
+simplicity and minimalism. Currently based on GTK+, a cross-platform
+widget toolkit, it provides an interface that focuses on three main
+components: A so-called view widget that represents the actual
+application (e.g. a website (browser), an image (image viewer) or the
+document (document viewer)), an input bar that is used to execute
+commands of the application and the status bar which provides the user
+with current information. girara was designed to replace and enhance the
+user interface that is used by zathura and jumanji and other features
+that those applications share.
diff --git a/x11/girara/pkg/PFRAG.shared b/x11/girara/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@lib lib/libgirara-gtk2.so.${LIBgirara-gtk2_VERSION}
diff --git a/x11/girara/pkg/PLIST b/x11/girara/pkg/PLIST
@@ -0,0 +1,44 @@
+@comment $OpenBSD$
+%%SHARED%%
+include/girara/
+include/girara/callbacks.h
+include/girara/commands.h
+include/girara/completion.h
+include/girara/config.h
+include/girara/datastructures.h
+include/girara/girara.h
+include/girara/gtk2-compat.h
+include/girara/macros.h
+include/girara/session.h
+include/girara/settings.h
+include/girara/shortcuts.h
+include/girara/statusbar.h
+include/girara/tabs.h
+include/girara/types.h
+include/girara/utils.h
+include/girara/version.h
+lib/libgirara-gtk2.a
+lib/pkgconfig/
+lib/pkgconfig/girara-gtk2.pc
+share/locale/
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/libgirara-gtk2-0.mo
+share/locale/eo/
+share/locale/eo/LC_MESSAGES/
+share/locale/eo/LC_MESSAGES/libgirara-gtk2-0.mo
+share/locale/es/
+share/locale/es/LC_MESSAGES/
+share/locale/es/LC_MESSAGES/libgirara-gtk2-0.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/fr/LC_MESSAGES/libgirara-gtk2-0.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/it/LC_MESSAGES/libgirara-gtk2-0.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
+share/locale/pl/LC_MESSAGES/libgirara-gtk2-0.mo
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
+share/locale/tr/LC_MESSAGES/libgirara-gtk2-0.mo