diff --git a/warzone2100.spec b/warzone2100.spec
index acf8e52..3c0cbcd 100644
--- a/warzone2100.spec
+++ b/warzone2100.spec
@@ -1,6 +1,6 @@
 Name:           warzone2100
 Version:        2.0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 Group:          Amusements/Games
@@ -9,18 +9,13 @@ URL:            http://wz2100.net/
 Source0:        http://download.gna.org/warzone/releases/2.0/%{name}-%{version}.tar.bz2
 Patch0:         warzone2100-2.0.7_hotfix1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64 ppc64
+ExclusiveArch:  i386 ppc
 
 BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
 BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel
 BuildRequires: automake >= 1.8
 BuildRequires: desktop-file-utils
-Requires: %{name}-data = %{version}
-
-%package data
-Summary: Warzone2100's data files
-Group:   Amusements/Games
-Requires: %{name} = %{version}
+Obsoletes:     warzone2100-data
 
 %description
 Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and
@@ -29,15 +24,6 @@ game's source code was liberated on December 6th, 2004, under a GPL license
 (see COPYING in this directory for details). Soon after that, the Warzone 2100
 ReDev project was formed to take care of its future.
 
-%description data
-Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and
-most will agree it didn't enjoy the commercial success it should have had. The
-game's source code was liberated on December 6th, 2004, under a GPL license
-(see COPYING in this directory for details). Soon after that, the Warzone 2100
-ReDev project was formed to take care of its future.
-
-Data (textures, maps, sounds and models) required to play warzone2100.
-
 %prep
 %setup -q
 %patch
@@ -66,13 +52,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/warzone2100
 %{_datadir}/icons/warzone*
 %{_datadir}/applications/fedora-%{name}.desktop
-%doc AUTHORS ChangeLog COPYING COPYING.README README TODO
-
-%files data
-%defattr(-,root,root,-)
 %{_datadir}/warzone2100
+%doc AUTHORS ChangeLog COPYING COPYING.README README TODO
 
 %changelog
+* Wed Oct 17 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.7-4
+- Merge data subpackage with core package
+- Replace ExcludeArch with ExclusiveArch
 * Sun Aug 19 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.7-3
 - Apply upstream patch
 * Sun Jun 24 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.7-2