Motivation always gets thrown around with discipline, but discipline is so much more important. It's what keeps you coming back and accomplishing something every day.
I like the suggestion about creating more rules; that's something I really need to get a handle on. I start and stop things once the motivation wears off, so rules should be quite helpful.