diff -Nru subtitleeditor-0.39.0/debian/changelog subtitleeditor-0.39.0/debian/changelog
--- subtitleeditor-0.39.0/debian/changelog	2011-08-01 17:56:48.000000000 +0000
+++ subtitleeditor-0.39.0/debian/changelog	2011-12-12 16:37:52.000000000 +0000
@@ -1,3 +1,13 @@
+subtitleeditor (0.39.0-2) experimental; urgency=low
+
+  * Add debian/patches/02-fix-broken-tag-handling.patch:
+    + Fix broken handling of '<br />' tags (closes: #646371).
+  * Add debian/patches/03-fix-mimetypes.patch:
+    + Don't handle MIME-Type "text/plain" (closes LP: #820474).
+  * Add section for debian/* to debian/copyright.
+  
+ -- Philip Rinn <rinni@gmx.net>  Mon, 12 Dec 2011 15:11:27 +0200
+
 subtitleeditor (0.39.0-1) experimental; urgency=low
 
   * New upstream release.
@@ -9,7 +19,6 @@
   
  -- Philip Rinn <rinni@gmx.net>  Sun, 31 Jul 2011 15:00:32 +0100
 
-
 subtitleeditor (0.38.0-1) experimental; urgency=low
 
   * New upstream release.
diff -Nru subtitleeditor-0.39.0/debian/copyright subtitleeditor-0.39.0/debian/copyright
--- subtitleeditor-0.39.0/debian/copyright	2010-12-08 10:38:13.000000000 +0000
+++ subtitleeditor-0.39.0/debian/copyright	2011-12-12 16:36:10.000000000 +0000
@@ -7,6 +7,10 @@
 Copyright: 2005-2009, IDJAAD djamel <kitone@free.fr>
 License: GPL-3+
 
+Files: debian/*
+Copyright: 2010-2011, Philip Rinn <rinni@gmx.net>
+License: GPL-3+
+
 License: GPL-3
  On Debian GNU/Linux systems, the complete text of the GNU General Public
  License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff -Nru subtitleeditor-0.39.0/debian/patches/02-fix-broken-tag-handling.patch subtitleeditor-0.39.0/debian/patches/02-fix-broken-tag-handling.patch
--- subtitleeditor-0.39.0/debian/patches/02-fix-broken-tag-handling.patch	1970-01-01 00:00:00.000000000 +0000
+++ subtitleeditor-0.39.0/debian/patches/02-fix-broken-tag-handling.patch	2011-12-12 16:08:17.000000000 +0000
@@ -0,0 +1,25 @@
+Author: upstream
+Description: Fix broken handling of '<br />' tags
+--- a/plugins/subtitleformats/timedtextauthoringformat1/timedtextauthoringformat1.cc
++++ b/plugins/subtitleformats/timedtextauthoringformat1/timedtextauthoringformat1.cc
+@@ -145,9 +145,18 @@
+ 		// text
+ 		if(p->has_child_text())
+ 		{
+-			Glib::ustring text = p->get_child_text()->get_content();
++			Glib::ustring text;
+ 
+-			utility::replace(text, "<br/>", "\n");
++			xmlpp::Node::NodeList children = p->get_children();
++			for(xmlpp::Node::NodeList::const_iterator it = children.begin(); it != children.end(); ++it)
++			{
++				xmlpp::ContentNode *cn = dynamic_cast<xmlpp::ContentNode*>(*it);
++				if(cn == NULL)
++					continue;
++				if(!text.empty())
++					text += "\n";
++				text += cn->get_content();
++			}
+ 
+ 			subtitle.set_text(text);
+ 		}
diff -Nru subtitleeditor-0.39.0/debian/patches/03-fix-mimetypes.patch subtitleeditor-0.39.0/debian/patches/03-fix-mimetypes.patch
--- subtitleeditor-0.39.0/debian/patches/03-fix-mimetypes.patch	1970-01-01 00:00:00.000000000 +0000
+++ subtitleeditor-0.39.0/debian/patches/03-fix-mimetypes.patch	2011-12-12 16:22:04.000000000 +0000
@@ -0,0 +1,11 @@
+Author: upstream
+Description: Subtitleeditor should not handle MIME-Type "text/plain" (Fix bug #18448)
+--- a/share/subtitleeditor.desktop.in
++++ a/share/subtitleeditor.desktop.in
+@@ -9,4 +9,4 @@
+ Icon=subtitleeditor
+ Categories=Video;AudioVideo;AudioVideoEditing;
+ StartupNotify=true
+-MimeType=application/x-microdvd;application/x-subrip;application/x-subviewer;text/x-mpsub;text/x-ssa;text/plain;
++MimeType=application/x-microdvd;application/x-subrip;application/x-subviewer;text/x-mpsub;text/x-ssa;
+
diff -Nru subtitleeditor-0.39.0/debian/patches/series subtitleeditor-0.39.0/debian/patches/series
--- subtitleeditor-0.39.0/debian/patches/series	2011-08-01 16:44:08.000000000 +0000
+++ subtitleeditor-0.39.0/debian/patches/series	2011-12-12 16:38:33.000000000 +0000
@@ -1 +1,3 @@
 01-fix-sami-build-error.patch
+02-fix-broken-tag-handling.patch
+03-fix-mimetypes.patch