diff --git a/.cvsignore b/.cvsignore
index cf76cfd..3825f95 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-freeciv-2.1.11.tar.bz2
+freeciv-2.2.0.tar.bz2
diff --git a/freeciv-client-fix-DSO.patch b/freeciv-client-fix-DSO.patch
new file mode 100644
index 0000000..a299f5b
--- /dev/null
+++ b/freeciv-client-fix-DSO.patch
@@ -0,0 +1,11 @@
+--- client/Makefile.in	2010-02-21 19:52:21.000000000 +0100
++++ client/Makefile.in.old	2010-03-02 22:27:58.000000000 +0100
+@@ -525,7 +525,7 @@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm
+ LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
+ LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
+ LIBICONV = @LIBICONV@
diff --git a/freeciv.spec b/freeciv.spec
index 4302d45..4238798 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -4,7 +4,7 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(%{_ggz_config} --datadir >& /dev/null ||:)}
 
 Name:           freeciv
-Version:        2.1.11
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        A multi-player strategy game
 
@@ -12,9 +12,11 @@ Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://freeciv.wikia.com/index.php/Freeciv
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch1:		%{name}-aifill.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+##Fix DSO patch
+Patch10:	freeciv-client-fix-DSO.patch
+
 BuildRequires:	gtk2-devel
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
@@ -39,14 +41,12 @@ in order to become the leader of the greatest civilization.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .aifill
-
+%patch10 -p0
 
 %build
-%configure --enable-client=gtk
+%configure --enable-client=gtk --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -67,12 +67,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual
 rm $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 # include .dsc files
 install -p -D -m644 data/civclient.dsc $RPM_BUILD_ROOT%{_ggz_datadir}/civclient.dsc
-
+find $RPM_BUILD_ROOT -name '*.la' -delete
+find $RPM_BUILD_ROOT -name '*.a' -delete
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/civclient.dsc || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -99,18 +99,20 @@ fi
 %doc doc/README.delta doc/README.effects doc/README.ftwl doc/HACKING
 %doc doc/README.scorelog doc/TODO
 %doc doc/README.graphics doc/README.sound
-%{_bindir}/civserver
-%{_bindir}/civclient
+%{_bindir}/freeciv-server
+%{_bindir}/freeciv-gtk2
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/pixmaps/%{name}-client.png
-%{_mandir}/man6/civserver.6.gz
-%{_mandir}/man6/civclient.6.gz
+%{_mandir}/man6/freeciv*6*
 %{_ggz_datadir}/civclient.dsc
 
 
 %changelog
+* Tue Mar 02 2010 Thomas Janssen <thomasj@fedoraproject.org> 2.2.0
+- New upstream source 2.2.0
+
 * Fri Jan 29 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.1.11-1
 - Update to 2.1.11.
 
diff --git a/sources b/sources
index b726a78..7cce09c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b064e5949d211a46a9d6d050f3c98959  freeciv-2.1.11.tar.bz2
+49c08904d2402fe46248641a8bbd9ef3  freeciv-2.2.0.tar.bz2