diff --git a/vim.changes b/vim.changes
index abeee8a..d6f73ab 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  9 17:01:46 CET 2010 - prusnak@suse.cz
+
+- build data subpackage as noarch
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:50 UTC 2009 - coolo@novell.com
 
diff --git a/vim.spec b/vim.spec
index 5c0f1f7..edc98b5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package vim (Version 7.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
 
 Name:           vim
 Version:        7.2
-Release:        16
+Release:        17
 #
-License:        Other uncritical OpenSource License   ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -126,11 +126,14 @@ Authors:
     Bram Moolenaar <bram@vim.org>
 
 %package data
-License:        Other uncritical OpenSource License   ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 PreReq:         %{vim_prereq}
 #
 Summary:        Vi IMproved
+%if 0%{?suse_version} >= 1120
+BuildArch:      noarch
+%endif
 
 %description data
 Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@@ -153,7 +156,7 @@ Authors:
     Bram Moolenaar <bram@vim.org>
 
 %package base
-License:        Other uncritical OpenSource License   ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 PreReq:         %{vim_prereq}
 PreReq:         update-alternatives
@@ -255,7 +258,7 @@ Authors:
 %endif
 
 %package -n gvim
-License:        Other uncritical OpenSource License   ; Charityware. If you wish please donate to Uganda
+License:        Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda
 Group:          Productivity/Editors/Vi
 PreReq:         %{gvim_prereq}
 PreReq:         update-alternatives