diff --git a/Scripts/build_nightly.rb b/Scripts/build_nightly.rb
index 59b0961dc..e7bc5335c 100755
--- a/Scripts/build_nightly.rb
+++ b/Scripts/build_nightly.rb
@@ -19,6 +19,22 @@ if appcast_revision < latest_revision
 	#Get the changelog
 	changelog = %x[svn log -r #{latest_revision}:#{appcast_revision+1}]
 
+  description = ''
+  ignore_next = false
+  changelog.each_line do |line|
+    if (ignore_next)
+      ignore_next = false
+      next
+    end
+    if Regexp.new('^-+$').match(line)
+      ignore_next = true
+      next
+    elsif Regexp.new('^\s*$').match(line)
+      next
+    end
+    description += line
+  end
+  
 	#Remove the previous build directories
 	%x[find . -type d -name build -print0 | xargs -0 rm -r ]
 
@@ -59,7 +75,7 @@ if appcast_revision < latest_revision
 	new_item.elements['title'].text = "Cog r#{latest_revision}"
 	
 	new_item.add_element('description')
-	new_item.elements['description'].text = changelog
+	new_item.elements['description'].text = description
 
 	new_item.add_element('pubDate')
 	new_item.elements['pubDate'].text = Time.now().strftime("%a, %d %b %Y %H:%M:%S %Z") #RFC 822
diff --git a/TODO b/TODO
index 8432192da..d6dd3bc3f 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,4 @@
 Bug fixes:
-#  Short files: http://sbooth.org/forums/viewtopic.php?p=4304
   Broken MP3: http://sbooth.org/forums/viewtopic.php?t=1103
-#  Shorten files: http://sbooth.org/forums/viewtopic.php?p=4305
   Windows M3U paths: http://sbooth.org/forums/viewtopic.php?t=1209
 ?  Playlist display: http://sbooth.org/forums/viewtopic.php?t=1050
-
-Nightlies:
-  Fix path inside nightly builds.
-  Make preference for update channels. Stable, Unstable, and Nightly.
-  Get sparkle working with nightlies!