diff --git a/srcpkgs/cairomm-devel b/srcpkgs/cairomm-devel
new file mode 120000
index 0000000000..673e5d855f
--- /dev/null
+++ b/srcpkgs/cairomm-devel
@@ -0,0 +1 @@
+cairomm
\ No newline at end of file
diff --git a/srcpkgs/cairomm/cairomm-devel.template b/srcpkgs/cairomm/cairomm-devel.template
new file mode 100644
index 0000000000..af4ff281c0
--- /dev/null
+++ b/srcpkgs/cairomm/cairomm-devel.template
@@ -0,0 +1,19 @@
+# Template file for 'cairomm-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run libsigc++-devel
+Add_dependency run cairo-devel
+Add_dependency run cairomm
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/{cairomm*,pkgconfig} ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/cairomm/depends b/srcpkgs/cairomm/depends
new file mode 100644
index 0000000000..6819f8d431
--- /dev/null
+++ b/srcpkgs/cairomm/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.8.4"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/cairomm/template b/srcpkgs/cairomm/template
new file mode 100644
index 0000000000..07174b995f
--- /dev/null
+++ b/srcpkgs/cairomm/template
@@ -0,0 +1,33 @@
+# Template build file for 'cairomm'.
+pkgname=cairomm
+version=1.8.4
+distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="C++ bindings to Cairo vector graphics library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=a28ec6d9af8f93d09076f32cd77de35f9d74a517def5dea12cb8cc2ce3a6c8f1
+long_desc="
+ cairomm is a C++ wrapper for the cairo graphics library. It offers all the
+ power of cairo with an interface familiar to C++ developers, including use of
+ the Standard Template Library where it makes sense."
+
+subpackages="$pkgname-devel"
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run libsigc++
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libpng
+Add_dependency run zlib
+Add_dependency run libX11
+Add_dependency run cairo
+
+Add_dependency build pkg-config
+Add_dependency build libsigc++-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libpng-devel
+Add_dependency build zlib-devel
+Add_dependency build libX11-devel
+Add_dependency build cairo-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 1fbf9fe221..c25cb1f231 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -606,3 +606,4 @@ libsigc-2.0.so			libsigc++		libsigc++-devel
 libglibmm-2.4.so		glibmm			glibmm-devel
 libgiomm-2.4.so			glibmm			glibmm-devel
 libglibmm_generate_extra_defs-2.4.so	glibmm		glibmm-devel
+libcairomm-1.0.so		cairomm			cairomm-devel