diff --git a/common/shlibs b/common/shlibs
index 7d689273987..2d009d79557 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1002,3 +1002,4 @@ libgvplugin_core.so.6 graphviz-libs-2.28.0_6
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
 libmowgli-2.so.0 libmowgli-2.0.0_1
+libguess.so.1 libguess-1.1_1
diff --git a/srcpkgs/libguess-devel b/srcpkgs/libguess-devel
new file mode 120000
index 00000000000..15830932f06
--- /dev/null
+++ b/srcpkgs/libguess-devel
@@ -0,0 +1 @@
+libguess
\ No newline at end of file
diff --git a/srcpkgs/libguess/libguess-devel.template b/srcpkgs/libguess/libguess-devel.template
new file mode 100644
index 00000000000..74445e10e1a
--- /dev/null
+++ b/srcpkgs/libguess/libguess-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'libguess-devel'.
+#
+noarch=yes
+depends="libmowgli-devel libguess>=${version}"
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/libguess/libguess.rshlibs b/srcpkgs/libguess/libguess.rshlibs
new file mode 100644
index 00000000000..60d981afbbb
--- /dev/null
+++ b/srcpkgs/libguess/libguess.rshlibs
@@ -0,0 +1,2 @@
+libmowgli-2.so.0
+libc.so.6
diff --git a/srcpkgs/libguess/template b/srcpkgs/libguess/template
new file mode 100644
index 00000000000..76b60a9f097
--- /dev/null
+++ b/srcpkgs/libguess/template
@@ -0,0 +1,32 @@
+# Template file for 'libguess'
+pkgname=libguess
+version=1.1
+build_style=gnu-configure
+makedepends="pkg-config libmowgli-devel"
+revision=1
+short_desc="High-speed character set detection library"
+maintainer="davehome <davehome@redthumb.info.tm>"
+homepage="http://www.atheme.org/project/libguess"
+license="custom"
+distfiles="http://distfiles.atheme.org/${pkgname}-${version}.tar.gz"
+checksum=e3c9ad3102c9447c591131674135795fb012e073d92e887a2b05c9bbbcbe913f
+long_desc="
+ High-speed character set detection library.
+
+ libguess employs discrete-finite automata to deduce the character set of the
+ input buffer. The advantage of this is that all character sets can be checked
+ in parallel, and quickly. Right now, libguess passes a byte to each DFA on the
+ same pass, meaning that the winning character set can be deduced as
+ efficiently as possible. 
+
+ libguess is fully reentrant, using only local stack memory for DFA operations."
+
+subpackages="${pkgname}-devel"
+
+pre_configure() {
+	sed -i 's/libmowgli >= 0.9.50/libmowgli-2/g' configure
+}
+
+post_install() {
+	vinstall COPYING 644 usr/share/licenses/${pkgname}
+}