diff --git a/xpilot-ng-4.7.2-rhbz830640.patch b/xpilot-ng-4.7.2-rhbz830640.patch
new file mode 100644
index 0000000..9c2ba3d
--- /dev/null
+++ b/xpilot-ng-4.7.2-rhbz830640.patch
@@ -0,0 +1,12 @@
+diff -up xpilot-ng-4.7.2/src/client/meta.h~ xpilot-ng-4.7.2/src/client/meta.h
+--- xpilot-ng-4.7.2/src/client/meta.h~	2005-01-04 22:38:12.000000000 +0100
++++ xpilot-ng-4.7.2/src/client/meta.h	2012-07-29 15:50:53.137403386 +0200
+@@ -72,7 +72,7 @@ struct ServerInfo {
+ 	*playlist,
+ 	*sound,
+ 	*teambases_str,
+-	*timing, *ip_str, *freebases, *queue_str, *domain, pingtime_str[5];
++	*timing, *ip_str, *freebases, *queue_str, *domain, pingtime_str[11];
+     unsigned port,
+ 	ip, users, bases, fps, uptime, teambases, queue, pingtime;
+     struct timeval start;
diff --git a/xpilot-ng.spec b/xpilot-ng.spec
index f10c21e..81d3fa9 100644
--- a/xpilot-ng.spec
+++ b/xpilot-ng.spec
@@ -7,7 +7,7 @@
 
 Name:           xpilot-ng
 Version:        4.7.2
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Multiplayer space arcade game
 
 Group:          Amusements/Games
@@ -29,6 +29,7 @@ Source12:       logwatch.serviceconf.xpilot
 Source13:       logwatch.shared.applyxpilotdate
 Patch0:         xpilot-ng-4.7.2-scoreassert.patch
 Patch1:         xpilot-ng-4.7.2-getline.patch
+Patch2:         xpilot-ng-4.7.2-rhbz830640.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -82,6 +83,7 @@ logwatch scripts for the Xpilot game server
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p1
 pushd doc/man
 iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-server.man > xpilot-ng-server.man.new
 mv xpilot-ng-server.man.new xpilot-ng-server.man
@@ -278,6 +280,9 @@ rm -rf $RPM_BUILD_ROOT
 %{logwatch_scripts}/shared/applyxpilotdate
 
 %changelog
+* Sun Jul 27 2012 Hans de Goede <hdegoede@redhat.com> - 4.7.2-22
+- Fix a crash in the welcome screen (rhbz#830640)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.7.2-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild