diff --git a/mcomix-0.95-termination-from-nonX.patch b/mcomix-0.95-termination-from-nonX.patch
new file mode 100644
index 0000000..1e3a83b
--- /dev/null
+++ b/mcomix-0.95-termination-from-nonX.patch
@@ -0,0 +1,12 @@
+--- mcomix-0.95/mcomix/main.py.debug	2011-11-05 05:13:53.000000000 +0900
++++ mcomix-0.95/mcomix/main.py	2011-12-14 13:17:17.554104349 +0900
+@@ -1120,7 +1120,8 @@
+             if thread is not threading.currentThread():
+                 thread.join()
+ 
+-        gtk.main_quit()
++        if gtk.main_level() > 0:
++            gtk.main_quit()
+ 
+ #: Main window instance
+ __main_window = None
diff --git a/mcomix.spec b/mcomix.spec
index a395179..3dc3906 100644
--- a/mcomix.spec
+++ b/mcomix.spec
@@ -1,6 +1,6 @@
 Name:		mcomix
 Version:	0.95
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	User-friendly, customizable image viewer for comic books
 
 Group:		Amusements/Graphics
@@ -13,6 +13,9 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		mcomix-0.92-fedora-rpmbuild-gtk.patch
 # Fedora specific(?): patch to search default localedir for gettext files
 Patch1:		mcomix-0.94-gettext-system-install.patch
+# Terminating mcomix from non-X causes RuntimeError
+# bug 767300
+Patch2:		mcomix-0.95-termination-from-nonX.patch
 
 BuildArch:	noarch
 BuildRequires:	gettext
@@ -39,6 +42,7 @@ is written in Python and uses GTK+ through the PyGTK bindings.
 %setup -q
 %patch0 -p1 -b .rpmbuild
 %patch1 -p1 -b .gettext
+%patch2 -p1 -b .nonx
 
 %build
 # save timestamps
@@ -158,6 +162,10 @@ exit 0
 
 
 %changelog
+* Wed Dec 14 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.95-2
+- Prevent RuntimeError when terminating mcomix from terminal
+  (bug 767300)
+
 * Tue Nov 15 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.95-1
 - 0.95
 - Require python-setuptools (bug 753961)