diff --git a/marble.changes b/marble.changes
index 159ab91..31beb2d 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 13 10:48:04 UTC 2011 - toddrme2178@gmail.com
+
+- Split documentation package (fix for RPMLINT warning)
+- Changed groups (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Thu Sep  1 23:30:04 CEST 2011 - dmueller@suse.de
 
diff --git a/marble.spec b/marble.spec
index 8f228b7..b986c9a 100644
--- a/marble.spec
+++ b/marble.spec
@@ -21,7 +21,7 @@ Name:           marble
 Version:        4.7.1
 Release:        1
 License:        LGPLv2.1+
-Summary:        A generic map viewer
+Summary:        Generic map viewer
 Url:            http://edu.kde.org
 Group:          Amusements/Teaching/Other
 Source0:        %{name}-%{version}.tar.bz2
@@ -30,9 +30,10 @@ BuildRequires:  fdupes
 BuildRequires:  kdebase4-workspace-devel
 BuildRequires:  libkdeedu4-devel
 BuildRequires:  perl
+Requires:       %{name}-data = %{version}
 Requires:       libkeduvocdocument4
-Requires:       marble-data = %{version}
 Requires:       libmarblewidget12 = %{version}
+Suggests:       %{name}-doc = %{version}
 Suggests:       libkeduvocdocument4
 Provides:       kde4-marble = 4.3.0
 Obsoletes:      kde4-marble < 4.3.0
@@ -40,10 +41,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 
 %description
-Marble is a viewer of map data
+Marble is a viewer of map data.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch1 -p1
 
 %build
@@ -55,15 +56,27 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 
 %install
   cd build
-%make_install
+  %make_install
   %suse_update_desktop_file %{name}       Education Geography
   %kde_post_install
   %fdupes -s %{buildroot}
 
+%package data
+License:        LGPLv2.1+
+Summary:        Generic map viewer: data
+Group:          Amusements/Teaching/Other
+Requires:       %{name} = %{version}
+Provides:       kde4-marble-data = 4.3.0
+Obsoletes:      kde4-marble-data < 4.3.0
+BuildArch:      noarch
+
+%description data
+Marble is a viewer of map data. This package contains its data.
+
 %package devel
 License:        LGPLv2.1+
-Summary:        A generic map viewer: Build Environment
-Group:          Amusements/Teaching/Other
+Summary:        Generic map viewer: Build Environment
+Group:          Development/Libraries/KDE
 Requires:       marble = %{version}
 Provides:       kde4-marble-devel = 4.3.0
 Obsoletes:      kde4-marble-devel < 4.3.0
@@ -71,66 +84,66 @@ Obsoletes:      kde4-marble-devel < 4.3.0
 %description devel
 Development headers and libraries for Marble.
 
-%package data
-BuildArch:      noarch
+%package doc
 License:        LGPLv2.1+
+Summary:        Marble documentation
 Group:          Amusements/Teaching/Other
-Summary:        Generic map viewer data
+Requires:       %{name} = %{version}
 Provides:       kde4-marble-data = 4.3.0
 Obsoletes:      kde4-marble-data < 4.3.0
+BuildArch:      noarch
+
+%description doc
+Marble is a viewer of map data. This package contains its documentation.
 
 %package -n libmarblewidget12
 License:        LGPLv2.1+
-Group:          Amusements/Teaching/Other
-Summary:        A generic map viewer: Shared Library
+Summary:        Generic map viewer: Shared Library
+Group:          Development/Libraries/KDE
 Recommends:     %{name} = %{version}
 
 %description -n libmarblewidget12
 The shared library for the MarbleWidget shared library.
 
-
-%description data
-Marble is a viewer of map data. This package contains its data.
-
-%post -n libmarblewidget12 -p /sbin/ldconfig
-
-%postun -n libmarblewidget12 -p /sbin/ldconfig
-
-%post -p /sbin/ldconfig
-
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post   -n libmarblewidget12 -p /sbin/ldconfig
+%postun -n libmarblewidget12 -p /sbin/ldconfig
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/marble/
-%_kde4_libdir/libmarblewidget.so
-%_kde4_appsdir/cmake/modules/FindMarble.cmake
+%{_kde4_libdir}/libmarblewidget.so
+%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
 
 %files data
 %defattr(-,root,root)
-%dir %{_datadir}/kde4/apps/marble
-%_kde4_appsdir/marble/data
+%{_kde4_appsdir}/marble/data
+
+%files doc
+%defattr(-,root,root)
+%{_kde4_htmldir}/en/marble/
 
 %files -n libmarblewidget12
 %defattr(-,root,root)
-%_kde4_libdir/libmarblewidget.so.*
+%{_kde4_libdir}/libmarblewidget.so.*
 
 %files
 %defattr(-,root,root)
-%exclude %_kde4_appsdir/marble/data
-%_kde4_bindir/geodatatest
-%_kde4_bindir/marble
-%_kde4_bindir/routing-instructions
-%_kde4_bindir/tilecreator
-%_kde4_modulesdir/libmarble_part.so
-%_kde4_modulesdir/plasma_applet_worldclock.so
-%_kde4_modulesdir/plugins/designer/*
-%_kde4_appsdir/marble/
-%_kde4_modulesdir/plugins/marble/
-%_kde4_applicationsdir/marble.desktop
-%_kde4_htmldir/en/marble/
-%_kde4_iconsdir/hicolor/*/apps/marble.*
-%_kde4_sharedir/config.kcfg/marble.kcfg
-%_kde4_servicesdir/*.desktop
+%exclude %{_kde4_appsdir}/marble/data
+%{_kde4_appsdir}/marble/
+%{_kde4_applicationsdir}/marble.desktop
+%{_kde4_bindir}/geodatatest
+%{_kde4_bindir}/marble
+%{_kde4_bindir}/routing-instructions
+%{_kde4_bindir}/tilecreator
+%{_kde4_configkcfgdir}/marble.kcfg
+%{_kde4_iconsdir}/hicolor/*/apps/marble.*
+%{_kde4_modulesdir}/libmarble_part.so
+%{_kde4_modulesdir}/plasma_applet_worldclock.so
+%{_kde4_modulesdir}/plugins/designer/*
+%{_kde4_modulesdir}/plugins/marble/
+%{_kde4_servicesdir}/*.desktop
 
 %changelog