diff --git a/anjuta-gtklabel-crash.patch b/anjuta-gtklabel-crash.patch
new file mode 100644
index 0000000..fa12c1c
--- /dev/null
+++ b/anjuta-gtklabel-crash.patch
@@ -0,0 +1,22 @@
+From 26f921e18ba037ab36be4068b30186a47df7c646 Mon Sep 17 00:00:00 2001
+From: Gennaro Bellizio <genbell@tiscali.it>
+Date: Sat, 10 Oct 2009 09:08:10 +0000
+Subject: bgo #597815 -  Crash due to malformed UI definition file
+
+---
+diff --git a/plugins/class-gen/anjuta-class-gen-plugin.ui b/plugins/class-gen/anjuta-class-gen-plugin.ui
+index 5b9fa72..c4d445a 100644
+--- a/plugins/class-gen/anjuta-class-gen-plugin.ui
++++ b/plugins/class-gen/anjuta-class-gen-plugin.ui
+@@ -693,7 +693,7 @@
+                                   </packing>
+                                 </child>
+                                 <child type="tab">
+-                                  <object class="GtkLabel">
++                                  <object class="GtkLabel" id="label53">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Properties</property>
+                                   </object>
+--
+cgit v0.8.2
+
diff --git a/anjuta-launchername.patch b/anjuta-launchername.patch
new file mode 100644
index 0000000..c1ed399
--- /dev/null
+++ b/anjuta-launchername.patch
@@ -0,0 +1,82 @@
+From 80ed77322e34ce4b12402ce37190abd4552aebab Mon Sep 17 00:00:00 2001
+From: Sébastien Granjoux <seb.sfo@free.fr>
+Date: Fri, 09 Oct 2009 19:51:38 +0000
+Subject: bgo#597318 -  Anjuta terminal crashes X
+
+---
+diff --git a/launcher/anjuta-launcher.c b/launcher/anjuta-launcher.c
+index f84ad2c..64e4b2f 100644
+--- a/launcher/anjuta-launcher.c
++++ b/launcher/anjuta-launcher.c
+@@ -1,5 +1,5 @@
+ /*
+-    anjuta_launcher.c
++    anjuta-launcher.c
+     Copyright (C) 2000  Kh. Naba Kumar Singh
+ 
+     This program is free software; you can redistribute it and/or modify
+@@ -49,7 +49,7 @@ main (int argc, char **argv)
+ 
+ 	if (strcmp (argv[1], "--version") == 0)
+ 	{
+-		printf ("anjuta_launcher version 0.1.2\n");
++		printf ("anjuta-launcher version 0.1.2\n");
+ 		exit (0);
+ 	}
+ 	if (strcmp (argv[1], "--__debug_terminal") == 0)
+diff --git a/plugins/build-basic-autotools/executer.c b/plugins/build-basic-autotools/executer.c
+index ec14228..45284ff 100644
+--- a/plugins/build-basic-autotools/executer.c
++++ b/plugins/build-basic-autotools/executer.c
+@@ -410,14 +410,14 @@ execute_program (BasicAutotoolsPlugin* plugin, const gchar *pre_select_uri)
+ 				{
+ 					gchar* oldcmd = cmd;
+ 				
+-					cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
++					cmd = g_strconcat ("anjuta-launcher ", oldcmd, NULL);
+ 
+ 					g_free (oldcmd);
+ 					g_free (launcher_path);
+ 				}
+ 				else
+ 				{
+-					DEBUG_PRINT("%s", "Missing anjuta_launcher");
++					DEBUG_PRINT("%s", "Missing anjuta-launcher");
+ 				}
+ 				
+ 			}
+diff --git a/plugins/gdb/plugin.c b/plugins/gdb/plugin.c
+index 159305b..370d9be 100644
+--- a/plugins/gdb/plugin.c
++++ b/plugins/gdb/plugin.c
+@@ -116,7 +116,7 @@ gdb_plugin_start_terminal (GdbPlugin* plugin)
+ 	}
+ 
+ 	/* Launch terminal */
+-	cmd = g_strconcat ("anjuta_launcher --__debug_terminal ", file, NULL);
++	cmd = g_strconcat ("anjuta-launcher --__debug_terminal ", file, NULL);
+ 	
+ 	/* Get terminal plugin */	
+ 	term = anjuta_shell_get_interface (ANJUTA_PLUGIN (plugin)->shell, IAnjutaTerminal, NULL);
+diff --git a/plugins/run-program/execute.c b/plugins/run-program/execute.c
+index d1db4b4..3d04501 100644
+--- a/plugins/run-program/execute.c
++++ b/plugins/run-program/execute.c
+@@ -243,12 +243,12 @@ execute_with_terminal (RunProgramPlugin *plugin,
+ 	
+ 	if (launcher_path != NULL)
+ 	{
+-		new_cmd = g_strconcat ("anjuta_launcher ", cmd, NULL);
++		new_cmd = g_strconcat ("anjuta-launcher ", cmd, NULL);
+ 		g_free (launcher_path);
+ 	}
+ 	else
+ 	{
+-		DEBUG_PRINT("%s", "Missing anjuta_launcher");
++		DEBUG_PRINT("%s", "Missing anjuta-launcher");
+ 		new_cmd = g_strdup (cmd);
+ 	}
+ 
+--
+cgit v0.8.2
+
diff --git a/anjuta.changes b/anjuta.changes
index e878cc1..cb10e21 100644
--- a/anjuta.changes
+++ b/anjuta.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Oct 17 20:24:25 CEST 2009 - dimstar@opensuse.org
+
+- Add anjuta-launchername.patch, fixes X resets, bgo#597318,
+  bnc#547917.
+- Add anjuta-gtklabel-crash.patch, fixes crash due to malformed
+  UI definition file, bgo#597815.
+
 -------------------------------------------------------------------
 Fri Oct 16 18:59:18 CEST 2009 - dimstar@opensuse.org
 
diff --git a/anjuta.spec b/anjuta.spec
index c2561b9..b7013ef 100644
--- a/anjuta.spec
+++ b/anjuta.spec
@@ -28,6 +28,10 @@ Source:         anjuta-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 # PATCH-FIX-UPSTREAM bcn#547672 dimstar@opensuse.org -- Patch taken from git commit f8dc87e
 Patch0:         anjuta-symboldb-fix.patch
+# PATCH-FIX-UPSTREAM bnc#547917 bgo#597318 dimstar@opensuse.org -- anjuta-launcher was renamed. Patch fixes X crashing.
+Patch1:         anjuta-launchername.patch
+# PATCH-FIX-UPSTREAM bgo#597815 dimstar@opensuse.org -- Crash due to malformed UI definition file
+Patch2:         anjuta-gtklabel-crash.patch
 BuildRequires:  autogen
 BuildRequires:  binutils-devel
 BuildRequires:  devhelp-devel
@@ -109,6 +113,7 @@ and can be unfriendly to use.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure\