diff --git a/src/calibre/gui2/images/news/joelonsoftware.png b/src/calibre/gui2/images/news/joelonsoftware.png
new file mode 100644
index 0000000000..9f21608105
Binary files /dev/null and b/src/calibre/gui2/images/news/joelonsoftware.png differ
diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 4e45175832..555377b653 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -21,6 +21,7 @@ recipe_modules = ['recipe_' + r for r in (
            'linux_magazine', 'telegraph_uk', 'utne', 'sciencedaily', 'forbes',
            'time_magazine', 'endgadget', 'fudzilla', 'nspm_int', 'nspm', 'pescanik',
            'spiegel_int', 'themarketticker', 'tomshardware', 'xkcd', 'ftd', 'zdnet',
+           'joelonsoftware',
           )]
 
 import re, imp, inspect, time, os
diff --git a/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py b/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py
new file mode 100644
index 0000000000..7c061562f5
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_joelonsoftware.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+joelonsoftware.com
+'''
+
+class Joelonsoftware(BasicNewsRecipe):
+    
+    title       = 'Joel on Software'
+    __author__  = 'Darko Miletic'
+    description = 'Painless Software Management'
+    no_stylesheets = True
+    use_embedded_content  = True
+    
+    cover_url = 'http://www.joelonsoftware.com/RssJoelOnSoftware.jpg'
+    
+    html2lrf_options = [  '--comment'       , description
+                        , '--category'      , 'blog,software,news'
+                        , '--author'        , 'Joel Spolsky'
+                       ]
+    
+    feeds = [(u'Articles', u'http://www.joelonsoftware.com/rss.xml')]