diff --git a/m17n-db.spec b/m17n-db.spec
index 4db3b76..6f8281e 100644
--- a/m17n-db.spec
+++ b/m17n-db.spec
@@ -1,8 +1,7 @@
-
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.4.0
-Release:    2.1%{?dist}
+Release:    3%{?dist}
 Group:      System Environment/Libraries
 License:    LGPL
 URL:        http://www.m17n.org/m17n-lib/index.html
@@ -33,39 +32,41 @@ m17n-db datafiles not needed for using the input maps.
 %package devel
 Summary:  Development files for m17n-db
 Group:    Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 m17n-db development files
 
 
 %package common-cjk
-Summary:  This package contains m17n-db common files for CJK input
+Summary:  Common m17n-db files for CJK input
 Group:    System Environment/Libraries
 
 %description common-cjk
 m17n-db common files for Chinese, Japanese and Korean input maps.
 
+
 %package chinese
-Summary: This package contains m17n-db input table for Chinese
+Summary:  Chinese m17n-db input maps
 Group:    System Environment/Libraries
-Requires:  %{name}-common-cjk
-Obsoletes:  %{name}-bopomofo < 1.3.3-13.fc6
+Requires: %{name}-common-cjk
+Obsoletes: %{name}-bopomofo < 1.3.3-13.fc6
 
 %description chinese
 m17n-db Chinese input map.
 
 
 %package generic
-Summary:  GenericThis package contains m17n-db input tables
+Summary:  Generic m17n-db input tables
 Group:    System Environment/Libraries
 
 %description generic
-GenericThis package contains m17n-db input table.
+This package contains generic m17n-db input tables.
+
 
 %package greek
-Summary: This package contains m17n-db input table for Greek
+Summary:  Greek m17n-db input tables
 Group:    System Environment/Libraries
 
 %description greek
@@ -74,18 +75,16 @@ m17n-db Greek input table.
 
 %define mk_pkg() \
 %package %1\
-Summary:    This package contains m17n-db input map for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
+Summary:    m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\
 Group:      System Environment/Libraries\
 \
 %description %1\
-This package provides m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/").\
+This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/").\
 \
 %files %1\
 %defattr(-,root,root)\
-%dir %{_datadir}/m17n\
 %{_datadir}/m17n/%2-*.mim\
 %if %3\
-%dir %{_datadir}/m17n/icons\
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
 %{nil}\
@@ -148,7 +147,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # don't need ispell or anthy
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
@@ -159,14 +158,14 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png}
 # dont install si-wijesekera.mim as si-wijesekera-predit.mim works for us, see RH bug 208104
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wijesekera.mim
 
-# drop pkgconfig file for now
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig/
 mv $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/pkgconfig/m17n-db.pc
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/m17n/
 
 # For installing the translation files
 %find_lang %name
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -176,16 +175,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING README
 %{_bindir}/*
 %dir %{_datadir}/m17n
+%dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
-#%{_datadir}/m17n/command.mim
 %{_datadir}/m17n/global.mim
 
 
-# move all translations to m17n-db-datafiles package
+# include translations
 %files datafiles -f %{name}.lang
 %defattr(-,root,root)
-%dir %{_datadir}/m17n
 %{_datadir}/m17n/*.flt
 %{_datadir}/m17n/*.fst
 %{_datadir}/m17n/*.map
@@ -199,24 +197,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files common-cjk
 %defattr(-,root,root)
-%dir %{_datadir}/m17n
 %{_datadir}/m17n/cjk-*.mim
-#%{_datadir}/m17n/variable.mim
 %{_datadir}/m17n/global.mim
 
 %files chinese
 %defattr(-,root,root)
-%dir %{_datadir}/m17n
-%dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/zh-*.mim
 %{_datadir}/m17n/icons/zh-*.png
-#%{_datadir}/m17n/bopo-*.mim
 %{_datadir}/m17n/icons/bopo-*.png
 
 %files generic
 %defattr(-,root,root)
-%dir %{_datadir}/m17n
-%dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/rfc1345.mim
 %{_datadir}/m17n/icons/rfc1345.png
 %{_datadir}/m17n/unicode.mim
@@ -224,15 +215,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files greek
 %defattr(-,root,root)
-%dir %{_datadir}/m17n
-%dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/el-*.mim
 %{_datadir}/m17n/grc-*.mim
 %{_datadir}/m17n/icons/el-*.png
 
 
 %changelog
-* Tue Jul 24 2007 Parag Nemade <pnemade@redhat.com> 
+* Wed Jul 25 2007 Jens Petersen <petersen@redhat.com> - 1.4.0-3
+- cleanup summaries and descriptions
+- make just main package own m17n and icons dir
+- replace %%makeinstall with make install
+
+* Tue Jul 24 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-2.1
 - Fix directory ownership issue
 
 * Mon Jul 23 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-2