diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..c609241
Binary files /dev/null and b/favicon.ico differ
diff --git a/gitdoc.rb b/gitdoc.rb
index 67f1b63..a840c01 100644
--- a/gitdoc.rb
+++ b/gitdoc.rb
@@ -164,6 +164,11 @@ def compile_sass_tags source
   send_file file
 end
 
+get '/favicon.ico' do
+  pass if File.exists? settings.dir + '/favicon.ico'
+  send_file settings.root + '/favicon.ico'
+end
+
 not_found do
   version = File.read(File.dirname(__FILE__)+'/VERSION')
   @doc = gd(