diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 9954a0618118..b5039c0eeaaf 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,68 +1,72 @@
 # New ports collection Makefile for:	geany
 # Date Created:				15 Jan 06
 # Whom:					Remington Lang <MrL0Lz@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.13
+PORTVERSION=	0.14
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	ar@null.lv
 COMMENT=	A fast and lightweight GTK+ IDE
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
 
 OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
 		NLS	"Enable Native Language support"		on
 
 MAN1=		geany.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 502010
 GNU_REGEX_H=	gnu/regex.h
 .else
 GNU_REGEX_H=	gnuregex.h
 .endif
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if !defined(WITHOUT_VTE)
 USE_GNOME+=	vte
 CONFIGURE_ARGS+=--enable-vte
 .else
 CONFIGURE_ARGS+=--disable-vte
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' ${WRKSRC}/scintilla/Makefile.in
 .for file in tagmanager/lregex.c src/encodings.c
 	@${REINPLACE_CMD} -e 's|<regex\.h>|<${GNU_REGEX_H}>|g' ${WRKSRC}/${file}
 .endfor
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 .endif
 .if defined(WITHOUT_NLS)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
 .endif
 
+post-configure:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications/
 	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 86cdd266e8b9..bfa281e244fd 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.13.tar.bz2) = 0dc4f30b5ee9132f136fd3e7e4f02e0c
-SHA256 (geany-0.13.tar.bz2) = cf75505392ea81f256a380a4c249d15325c290fabac95b4584b0f66af432a9a1
-SIZE (geany-0.13.tar.bz2) = 2052311 
+MD5 (geany-0.14.tar.bz2) = c6c22c7f9feff81a15f5c8ece03b87c1
+SHA256 (geany-0.14.tar.bz2) = 619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
+SIZE (geany-0.14.tar.bz2) = 2120062
diff --git a/devel/geany/files/patch-tagmaster-html.c b/devel/geany/files/patch-tagmaster-html.c
new file mode 100644
index 000000000000..b86bebe39746
--- /dev/null
+++ b/devel/geany/files/patch-tagmaster-html.c
@@ -0,0 +1,11 @@
+--- tagmanager/html.c.orig	2008-04-26 03:13:29.000000000 +0300
++++ tagmanager/html.c	2008-04-26 03:13:42.000000000 +0300
+@@ -31,7 +31,7 @@
+ 
+ /* this matches simple heading without nested tags */
+ /** TODO combine both pattern to be able to match both heading styles */
+-#define INNER_HEADING "[ \t]*(.*+)[ \t]*"
++#define INNER_HEADING "[ \t]*(.+)[ \t]*"
+ 
+ 	addTagRegex (language,
+ 		"<a"
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index a8b69bc7af6b..0b0710dcc7c4 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -1,116 +1,153 @@
 bin/geany
+include/geany/dialogs.h
+include/geany/document.h
+include/geany/editor.h
+include/geany/encodings.h
+include/geany/filetypes.h
+include/geany/geany.h
+include/geany/highlighting.h
+include/geany/keybindings.h
+include/geany/msgwindow.h
+include/geany/plugindata.h
+include/geany/pluginmacros.h
+include/geany/plugins.h
+include/geany/prefs.h
+include/geany/project.h
+include/geany/scintilla/SciLexer.h
+include/geany/scintilla/Scintilla.h
+include/geany/scintilla/Scintilla.iface
+include/geany/scintilla/ScintillaWidget.h
+include/geany/sciwrappers.h
+include/geany/search.h
+include/geany/support.h
+include/geany/tagmanager/tm_file_entry.h
+include/geany/tagmanager/tm_project.h
+include/geany/tagmanager/tm_source_file.h
+include/geany/tagmanager/tm_symbol.h
+include/geany/tagmanager/tm_tag.h
+include/geany/tagmanager/tm_tagmanager.h
+include/geany/tagmanager/tm_work_object.h
+include/geany/tagmanager/tm_workspace.h
+include/geany/templates.h
+include/geany/ui_utils.h
+include/geany/utils.h
 lib/geany/autosave.la
 lib/geany/autosave.so
 lib/geany/classbuilder.la
 lib/geany/classbuilder.so
 lib/geany/export.la
 lib/geany/export.so
 lib/geany/filebrowser.la
 lib/geany/filebrowser.so
 lib/geany/htmlchars.la
 lib/geany/htmlchars.so
 lib/geany/vcdiff.la
 lib/geany/vcdiff.so
+libdata/pkgconfig/geany.pc
 share/applications/geany.desktop
 share/icons/hicolor/16x16/apps/classviewer-class.png
 share/icons/hicolor/16x16/apps/classviewer-macro.png
 share/icons/hicolor/16x16/apps/classviewer-member.png
 share/icons/hicolor/16x16/apps/classviewer-method.png
 share/icons/hicolor/16x16/apps/classviewer-namespace.png
 share/icons/hicolor/16x16/apps/classviewer-other.png
 share/icons/hicolor/16x16/apps/classviewer-struct.png
 share/icons/hicolor/16x16/apps/classviewer-var.png
 share/pixmaps/geany.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_display.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_printing.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_toolbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/replace_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%DATADIR%%/GPL-2
 %%DATADIR%%/filetype_extensions.conf
 %%DATADIR%%/filetypes.asm
 %%DATADIR%%/filetypes.c
 %%DATADIR%%/filetypes.caml
 %%DATADIR%%/filetypes.common
 %%DATADIR%%/filetypes.conf
 %%DATADIR%%/filetypes.cpp
 %%DATADIR%%/filetypes.cs
 %%DATADIR%%/filetypes.css
 %%DATADIR%%/filetypes.d
 %%DATADIR%%/filetypes.diff
 %%DATADIR%%/filetypes.docbook
 %%DATADIR%%/filetypes.ferite
 %%DATADIR%%/filetypes.fortran
 %%DATADIR%%/filetypes.freebasic
 %%DATADIR%%/filetypes.haskell
 %%DATADIR%%/filetypes.haxe
 %%DATADIR%%/filetypes.html
 %%DATADIR%%/filetypes.java
 %%DATADIR%%/filetypes.javascript
 %%DATADIR%%/filetypes.latex
 %%DATADIR%%/filetypes.lua
 %%DATADIR%%/filetypes.makefile
 %%DATADIR%%/filetypes.oms
 %%DATADIR%%/filetypes.pascal
 %%DATADIR%%/filetypes.perl
 %%DATADIR%%/filetypes.php
 %%DATADIR%%/filetypes.python
 %%DATADIR%%/filetypes.restructuredtext
 %%DATADIR%%/filetypes.ruby
 %%DATADIR%%/filetypes.sh
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
 %%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/global.tags
 %%DATADIR%%/html_entities.tags
 %%DATADIR%%/latex.tags
 %%DATADIR%%/pascal.tags
 %%DATADIR%%/php.tags
 %%DATADIR%%/snippets.conf
 %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/de/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/el/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/es/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/it/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/geany.mo
 @dirrm lib/geany
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+@dirrm include/geany/tagmanager
+@dirrm include/geany/scintilla
+@dirrm include/geany