diff --git a/hugolib/site.go b/hugolib/site.go
index d6e6368c6..4f8444480 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -332,6 +332,10 @@ func (s *Site) setOutFile(p *Page) {
 	// Always use Url if it's specified
 	if len(strings.TrimSpace(p.Url)) > 2 {
 		p.OutFile = strings.TrimSpace(p.Url)
+
+		if strings.HasSuffix(p.OutFile, "/") {
+			p.OutFile = p.OutFile + "index.html"
+		}
 		return
 	}
 
diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 984b1545f..249eba266 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -16,6 +16,12 @@ content`
 var TEMPLATE_MISSING_FUNC = "{{ .Title | funcdoesnotexists }}"
 var TEMPLATE_FUNC = "{{ .Title | urlize }}"
 
+var PAGE_URL_SPECIFIED = `---
+title: simple template
+url: "mycategory/my-whatever-content/"
+---
+content`
+
 func pageMust(p *Page, err error) *Page {
 	if err != nil {
 		panic(err)
@@ -159,3 +165,15 @@ func TestRenderThingOrDefault(t *testing.T) {
 			t.Errorf("Content does not match.  Expected '%s', got '%s'", test.expected, html)
 		}
 	}}
+
+func TestSetOutFile(t *testing.T) {
+    s := new(Site)
+	p := pageMust(ReadFrom(strings.NewReader(PAGE_URL_SPECIFIED), "content/a/file.md"))
+    s.setOutFile(p)
+
+    expected := "mycategory/my-whatever-content/index.html"
+
+    if p.OutFile != "mycategory/my-whatever-content/index.html" {
+        t.Errorf("Outfile does not match.  Expected '%s', got '%s'", expected, p.OutFile)
+    }
+}