diff --git a/configure.ac.in b/configure.ac.in
index f2114e5..7505063 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -84,5 +84,6 @@ themes/Default/Makefile
 themes/Default-tiny/Makefile
 themes/Horrid/Makefile
 themes/Tango/Makefile
+themes/Chibi/Makefile
 ])
 AC_OUTPUT
diff --git a/themes/Chibi/Makefile.am b/themes/Chibi/Makefile.am
new file mode 100644
index 0000000..bc895c7
--- /dev/null
+++ b/themes/Chibi/Makefile.am
@@ -0,0 +1,8 @@
+Chibidir = $(datadir)/xfce4/eyes/themes/Chibi
+
+Chibi_DATA =								\
+	chibi-eye.png							\
+	chibi-pupil.png							\
+	config
+
+EXTRA_DIST = $(Chibi_DATA)
diff --git a/themes/Chibi/chibi-eye.png b/themes/Chibi/chibi-eye.png
new file mode 100644
index 0000000..444e259
Binary files /dev/null and b/themes/Chibi/chibi-eye.png differ
diff --git a/themes/Chibi/chibi-pupil.png b/themes/Chibi/chibi-pupil.png
new file mode 100644
index 0000000..93d0fca
Binary files /dev/null and b/themes/Chibi/chibi-pupil.png differ
diff --git a/themes/Chibi/config b/themes/Chibi/config
new file mode 100644
index 0000000..03703fe
--- /dev/null
+++ b/themes/Chibi/config
@@ -0,0 +1,4 @@
+wall-thickness = 4
+num-eyes = 2
+eye-pixmap = "chibi-eye.png"
+pupil-pixmap = "chibi-pupil.png"
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 23fc69c..2e8b111 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = 						\
 	Default						\
 	Default-tiny				\
 	Horrid						\
-	Tango
+	Tango						\
+	Chibi
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: