diff --git a/python-dialog-demo.patch b/python-dialog-demo.patch
new file mode 100644
index 0000000..6e79dd5
--- /dev/null
+++ b/python-dialog-demo.patch
@@ -0,0 +1,11 @@
+--- demo.py.orig	2004-09-03 09:48:45.000000000 +0200
++++ demo.py	2011-01-20 13:37:06.000000000 +0100
+@@ -109,7 +109,7 @@
+ 
+ 
+ def textbox_demo(d):
+-    d.textbox("demo.py", width=76)
++    d.textbox(os.path.abspath(__file__), width=76)
+ 
+ 
+ def inputbox_demo(d):
diff --git a/python-dialog.spec b/python-dialog.spec
index 41a8ba8..5b21c98 100644
--- a/python-dialog.spec
+++ b/python-dialog.spec
@@ -2,13 +2,16 @@
 
 Name:           python-dialog
 Version:        2.7
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pythondialog.sourceforge.net
 Source0:        http://downloads.sourceforge.net/pythondialog/pythondialog-2.7.tar.bz2
+Patch0:         python-dialog-demo.patch
+# filed into upstream bugtracker as
+# http://sourceforge.net/tracker/?func=detail&aid=3162630&group_id=58155&atid=486713
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,11 +25,14 @@ features from Python code.
 
 %prep
 %setup -q -n pythondialog-%{version}
-
+%patch0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
+iconv -f latin2 -t utf-8 TODO > TODO.utf8
+mv TODO.utf8 TODO
+iconv -f latin2 -t utf-8 README > README.utf8
+mv README.utf8 README
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +51,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 20 2011 Miloš Jakubíček <xjakub@fi.muni.cz> - 2.7-13
+- Added python-dialog-demo.patch, fix BZ#594988
+- Fix rpmlint: W: file-not-utf8 /usr/share/doc/python-dialog-2.7/TODO
+- Fix rpmlint: W: file-not-utf8 /usr/share/doc/python-dialog-2.7/README
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 2.7-12
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild