diff --git a/images/coffee.gif b/images/coffee.gif
new file mode 100644
index 0000000000..7e20371741
Binary files /dev/null and b/images/coffee.gif differ
diff --git a/include/text.php b/include/text.php
index 8206ba7e92..9aca145988 100755
--- a/include/text.php
+++ b/include/text.php
@@ -679,7 +679,7 @@ function smilies($s) {
 
 	$s = str_replace(
 	array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', 
- ':beer', ':homebrew', 
+ ':beer', ':homebrew', ':coffee', 
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -705,6 +705,7 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
+		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
 
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',