diff --git a/.cvsignore b/.cvsignore
index b1863db..4c633c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-insight-6.8.tar.bz2
+insight-6.8-1.tar.bz2
diff --git a/insight-6.8.1-baseclassfield.patch b/insight-6.8.1-baseclassfield.patch
new file mode 100644
index 0000000..bcb0456
--- /dev/null
+++ b/insight-6.8.1-baseclassfield.patch
@@ -0,0 +1,28 @@
+diff -Naur insight-6.8-1.orig/gdb/dwarf2read.c insight-6.8-1.new/gdb/dwarf2read.c
+--- insight-6.8-1.orig/gdb/dwarf2read.c	2010-01-13 14:55:05.000000000 +0100
++++ insight-6.8-1.new/gdb/dwarf2read.c	2010-01-13 15:02:55.000000000 +0100
+@@ -3593,9 +3593,21 @@
+     {
+       /* C++ base class field.  */
+       attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
+-      if (attr)
+-	FIELD_BITPOS (*fp) = (decode_locdesc (DW_BLOCK (attr), cu)
+-			      * bits_per_byte);
++
++      if (attr) {
++	int byte_offset = 0;
++
++	if (attr_form_is_section_offset(attr))
++	  dwarf2_complex_location_expr_complaint();
++	else if (attr_form_is_constant(attr))
++	  byte_offset = dwarf2_get_attr_constant_value(attr, 0);
++	else if (attr_form_is_block(attr))
++	  byte_offset = decode_locdesc(DW_BLOCK(attr), cu);
++	else
++	  dwarf2_complex_location_expr_complaint();
++
++	FIELD_BITPOS(*fp) = byte_offset * bits_per_byte;
++      }
+       FIELD_BITSIZE (*fp) = 0;
+       FIELD_STATIC_KIND (*fp) = 0;
+       FIELD_TYPE (*fp) = die_type (die, cu);
diff --git a/insight.desktop b/insight.desktop
index 32be01c..bd9584f 100644
--- a/insight.desktop
+++ b/insight.desktop
@@ -5,6 +5,6 @@ GenericName=Insight Debugger
 Comment=GDB Debugger GUI
 Exec=insight
 Icon=insight
-Terminal=false
+Terminal=true
 Type=Application
 Categories=Development;Debugger;
diff --git a/insight.spec b/insight.spec
index 6fb86e8..48d85ce 100644
--- a/insight.spec
+++ b/insight.spec
@@ -1,11 +1,13 @@
+%global ver	6.8-1
+
 Name:		insight
-Version:	6.8
-Release:	9%{?dist}
+Version:	%(echo %{ver} | tr - .)
+Release:	1%{?dist}
 Summary:	Graphical debugger based on GDB
 License:	GPLv3+
 Group:		Development/Debuggers
 Url:		http://sources.redhat.com/insight/
-Source0:	ftp://sourceware.org/pub/insight/releases/insight-%{version}.tar.bz2
+Source0:	ftp://sourceware.org/pub/insight/releases/insight-%{ver}.tar.bz2
 Source1:	insight.desktop
 Source2:	insight.1
 Patch1:		insight-6.8-warnings.patch
@@ -22,6 +24,7 @@ Patch11:	insight-6.8-lib64.patch
 Patch12:	insight-6.8-gcc44.patch
 Patch13:	insight-6.8-doubleinstall.patch
 Patch14:	insight-6.8-readline6.patch
+Patch15:	insight-6.8.1-baseclassfield.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	iwidgets
 BuildRequires:	tcl-devel
@@ -48,7 +51,7 @@ GDB version 6.x.
 %prep 
 #-------------------------------------------------------------------------------
 
-%setup -q
+%setup -q -n insight-%{ver}
 %patch1 -p1 -b .warnings
 %patch2 -p1 -b .destdir
 %patch3 -p1 -b .derefbug
@@ -63,6 +66,7 @@ GDB version 6.x.
 %patch12 -p1 -b .gcc44
 %patch13 -p1 -b .doubleinstall
 %patch14 -p1 -b .readline6
+%patch15 -p1 -b .baseclassfield
 
 
 #-------------------------------------------------------------------------------
@@ -216,11 +220,16 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 #-------------------------------------------------------------------------------
 %changelog
+#-------------------------------------------------------------------------------
+
+* Wed Jan 13 2010 Patrick Monnerat <pm@datasphere.ch> 6.8.1-1
+- New version.
+- Patch "baseclassfield" to fix bug BZ 551126.
+- Start a terminal for standard IO when invoked through desktop file.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-#-------------------------------------------------------------------------------
-
 * Wed Jul 15 2009 Patrick Monnerat <pm@datasphere.ch> 6.8-8
 - Fix bug #511501: combobox.tcl installed twice causes build failure.
 - Patch "readline6" to use system readline version 6.
diff --git a/sources b/sources
index 7088e9d..5f17386 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b403972b35520399663c7054e8132ca9  insight-6.8.tar.bz2
+4ee9824c1e8d6108d886c6c09b24f0ac  insight-6.8-1.tar.bz2