diff --git a/common/shlibs b/common/shlibs
index 939ab5f09ae..15af601f7ee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2146,3 +2146,5 @@ libglog.so.0 glog-0.3.4_1
 libzita-convolver.so.3 zita-convolver-3.1.0_1
 libpugixml.so.1 pugixml-1.6_1
 libnewt.so.0.52 newt-0.52.18_1
+libgeany.so.0 geany-1.25_1
+libctpl.so.2 ctpl-0.3.4_1
diff --git a/srcpkgs/ctpl-devel b/srcpkgs/ctpl-devel
new file mode 120000
index 00000000000..813c0c94f0e
--- /dev/null
+++ b/srcpkgs/ctpl-devel
@@ -0,0 +1 @@
+ctpl
\ No newline at end of file
diff --git a/srcpkgs/ctpl/template b/srcpkgs/ctpl/template
new file mode 100644
index 00000000000..5201cb5219b
--- /dev/null
+++ b/srcpkgs/ctpl/template
@@ -0,0 +1,24 @@
+# Template file for 'ctpl'
+pkgname=ctpl
+version=0.3.4
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Template library written in C"
+maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+license="GPL-3"
+homepage="http://ctpl.tuxfamily.org/"
+distfiles="http://download.tuxfamily.org/${pkgname}/releases/${pkgname}-${version}.tar.gz"
+checksum=3a95fdd03437ed3ae222339cb0de2d2c1240d627faa6c77bf46f1a9b761729fb
+
+ctpl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
+	}
+}
diff --git a/srcpkgs/geany-plugins-extra b/srcpkgs/geany-plugins-extra
new file mode 120000
index 00000000000..283d219b214
--- /dev/null
+++ b/srcpkgs/geany-plugins-extra
@@ -0,0 +1 @@
+geany-plugins
\ No newline at end of file
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
new file mode 100644
index 00000000000..a57e8210774
--- /dev/null
+++ b/srcpkgs/geany-plugins/template
@@ -0,0 +1,49 @@
+# Template file for 'geany-plugins'
+pkgname=geany-plugins
+version=1.25
+revision=1
+build_style=gnu-configure
+# XXX: gitchangebar plugin not compatible with libgit2 right now
+configure_args="--enable-all-plugins --disable-gitchangebar"
+hostmakedepends="automake gettext-devel intltool libtool pkg-config vala
+ glib-devel python-devel"
+makedepends="geany-devel lua51-devel ctpl-devel libwnck2-devel GConf-devel
+ webkitgtk2-devel zlib-devel gpgme-devel enchant-devel pygtk-devel"
+_short_desc="Geany IDE plugins"
+short_desc="${_short_desc} meta-package"
+maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+license="GPL-2"
+homepage="http://plugins.geany.org"
+distfiles="https://github.com/geany/geany-plugins/archive/1.25.tar.gz"
+checksum=626e606b5766685c86bae622f78912900b95b4a1c43c086ed9a3862691f8b257
+
+replaces="geany-plugins<${version}"
+
+if [ "$CROSS_BUILD" ]; then
+	# these plugins break cross-compile
+	configure_args+=" --disable-geanypy --disable-markdown"
+fi
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
+
+# these plugins require extra dependencies
+geany-plugins-extra_package() {
+	short_desc="${_short_desc} - extra plugins"
+	pkg_install() {
+		for p in devhelp geanygendoc geanylua geanypg geanypy geniuspaste \
+			markdown pretty-printer spellcheck updatechecker webhelper; do
+			if [ -x ${DESTDIR}/usr/lib/geany/${p}.so ]; then
+				vmove usr/lib/geany/${p}.so
+			fi
+			if [ -x ${DESTDIR}/usr/share/geany-plugins/${p} ]; then
+				vmove usr/share/geany-plugins/${p}
+			fi
+			if [ -x ${DESTDIR}/usr/share/doc/geany-plugins/${p} ]; then
+				vmove usr/share/doc/geany-plugins/${p}
+			fi
+		done
+	}
+}
+
diff --git a/srcpkgs/geany-plugins/update b/srcpkgs/geany-plugins/update
new file mode 100644
index 00000000000..cc95f08f0ba
--- /dev/null
+++ b/srcpkgs/geany-plugins/update
@@ -0,0 +1 @@
+site="http://plugins.geany.org/downloads.html"
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 7d27c802edd..8942229a61a 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -1,8 +1,7 @@
 # Template file for 'geany'
 pkgname=geany
 version=1.25
-revision=1
-replaces="geany-plugins>=0"
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool python"
 makedepends="gtk+-devel vte-devel"
@@ -19,10 +18,11 @@ pre_configure() {
 }
 
 geany-devel_package() {
-	depends="${makedepends}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - Development files"
 	pkg_install() {
-        	vmove usr/include
-        	vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
 	}
 }