diff --git a/History.txt b/History.txt
index 8c821b9b..d28726a9 100644
--- a/History.txt
+++ b/History.txt
@@ -1,6 +1,7 @@
 == Edge
   * Bug Fixes
     * Render highlighted code for non markdown/textile pages (#116)
+    * Expand source to full path so includes work anywhere (#101)
 
 == 0.5.7 / 2010-01-12
   * Minor Enhancements
diff --git a/features/create_sites.feature b/features/create_sites.feature
index 4f5385b0..f09b5a66 100644
--- a/features/create_sites.feature
+++ b/features/create_sites.feature
@@ -74,3 +74,12 @@ Feature: Create sites
     When I run jekyll
     Then the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
+
+  Scenario: Basic site with subdir include tag
+    Given I have a _includes directory
+    And I have an "_includes/about.textile" file that contains "Generated by Jekyll"
+    And I have an info directory
+    And I have an "info/index.html" page that contains "Basic Site with subdir include tag: {% include about.textile %}"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Basic Site with subdir include tag: Generated by Jekyll" in "_site/info/index.html"
\ No newline at end of file
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 9fc91013..38a87c37 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -39,7 +39,7 @@ Given /^I have a (.*) layout that contains "(.*)"$/ do |layout, text|
   end
 end
 
-Given /^I have a (.*) directory$/ do |dir|
+Given /^I have an? (.*) directory$/ do |dir|
   FileUtils.mkdir_p(dir)
 end