diff --git a/README.md b/README.md
index 3de7016..87a5d95 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ repo is me starting to collect useful patterns. Currently this
 repository contains patterns for:
 
 * [Lograge](https://github.com/roidrage/lograge) - making Rails logs suck less
+* [lighttpd](http://redmine.lighttpd.net/projects/1/wiki/Docs_ModAccesslog) - default lighttpd accesslog format
 
 ## Tests
 
diff --git a/patterns/lighttpd b/patterns/lighttpd
new file mode 100644
index 0000000..7dce2a0
--- /dev/null
+++ b/patterns/lighttpd
@@ -0,0 +1 @@
+LIGHTTPD %{IPORHOST:clientip} %{IPORHOST:httphost} %{USER:auth} \[%{HTTPDATE:timestamp}\] "(?:%{WORD:verb} %{URIPATHPARAM:request}(?: HTTP/%{NUMBER:httpversion})|-)" %{NUMBER:response} (?:%{NUMBER:bytes}|-) "(?:%{URI:referrer}|-)" %{QS:agent}
diff --git a/spec/lighttpd_spec.rb b/spec/lighttpd_spec.rb
new file mode 100644
index 0000000..1da84ff
--- /dev/null
+++ b/spec/lighttpd_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe "the lighttpd grok pattern" do
+
+  before do
+    @grok = Grok.new
+    @grok.add_patterns_from_file("patterns/logstash")
+    @grok.add_patterns_from_file("patterns/lighttpd")
+    @grok.compile('%{LIGHTTPD}')
+  end
+
+  # this covers the following lighttpd acceslog format
+  # accesslog.format = "%h %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
+  #
+  # http://redmine.lighttpd.net/projects/1/wiki/Docs_ModAccesslog
+
+  describe "with a custom lighttpd log line" do
+    before do
+      log_line = '192.168.128.150 staging.ischool.zm - [21/Nov/2012:10:11:35 +0200] "GET /styles/tle_new.css HTTP/1.1" 200 6705 "http://staging.ischool.zm/" "Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:14.0) Gecko/20100101 Firefox/14.0.1"'
+      @match = @grok.match(log_line)
+    end
+
+    it "should have the correct client ip" do
+      @match.should have_logstash_field("clientip").with_value("192.168.128.150")
+    end
+
+    it "should have the correct http method value" do
+      @match.should have_logstash_field("verb").with_value("GET")
+    end
+
+    it "should have the correct agent" do
+      @match.should have_logstash_field("agent").with_value("\"Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:14.0) Gecko/20100101 Firefox/14.0.1\"")
+    end
+
+    it "should have the correct status code" do
+      @match.should have_logstash_field("response").with_value("200")
+    end
+
+  end
+
+end
diff --git a/spec/nginx_spec.rb b/spec/nginx_spec.rb
index ab0ca12..015b1fb 100644
--- a/spec/nginx_spec.rb
+++ b/spec/nginx_spec.rb
@@ -22,10 +22,14 @@
       @match = @grok.match(log_line)
     end
 
-    it "should have the correct http method value" do
+    it "should have the correct client ip" do
       @match.should have_logstash_field("clientip").with_value("10.234.66.250")
     end
 
+    it "should have the correct http method value" do
+      @match.should have_logstash_field("verb").with_value("GET")
+    end
+
     it "should have the correct agent" do
       @match.should have_logstash_field("agent").with_value("\"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)\"")
     end