diff --git a/page.go b/page.go
index d574996..32b08e2 100644
--- a/page.go
+++ b/page.go
@@ -14,6 +14,7 @@ import (
 type Page struct {
 	Title   string
 	Date    time.Time
+	Name    string `yaml:"-"`
 	Path    string `yaml:"-"`
 	Content string `yaml:"-"`
 	Params  map[string]string
@@ -61,7 +62,10 @@ func NewPage(path string, content []byte) *Page {
 	}
 
 	// Remove extension from path
-	page.Path = "/" + strings.TrimSuffix(path, pathpkg.Ext(path)) + "/"
+	// TODO: Allow using ugly URLs
+	path = strings.TrimSuffix(path, pathpkg.Ext(path))
+	page.Name = pathpkg.Base(path)
+	page.Path = "/" + path + "/"
 	page.Content = string(content)
 	return &page
 }