diff --git a/CHANGELOG.md b/CHANGELOG.md
index 210d15653..b9f5e949d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ BUG FIXES:
 
   - Ignore "guest not ready" errors when attempting to graceful halt and
     carry on checks whether the halt succeeded. [GH-1679]
+  - Handle the case where a roles path for Chef solo isn't properly
+	defined. [GH-1665]
 
 ## 1.2.2 (April 23, 2013)
 
diff --git a/templates/provisioners/chef_solo/solo.erb b/templates/provisioners/chef_solo/solo.erb
index 80f8989a9..10a108437 100644
--- a/templates/provisioners/chef_solo/solo.erb
+++ b/templates/provisioners/chef_solo/solo.erb
@@ -3,7 +3,9 @@ node_name "<%= node_name %>"
 <% end %>
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path.inspect %>
+<% if roles_path %>
 role_path <%= roles_path.inspect %>
+<% end %>
 log_level <%= log_level.inspect %>
 
 encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"