diff --git a/augeas.changes b/augeas.changes
index afd44b7..c54901e 100644
--- a/augeas.changes
+++ b/augeas.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 22 08:50:38 UTC 2011 - dmacvicar@suse.de
+
+- move lenses from /usr/share/libaugeas0/augeas
+  to /usr/share/augeas (bnc#719199)
+- move vim lenses syntax files from -lenses to -devel package
+
 -------------------------------------------------------------------
 Sat Sep 17 13:40:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/augeas.spec b/augeas.spec
index d5afcc5..45a52ce 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -104,19 +104,14 @@ modifying the official lenses, or when creating new ones.
 
 %build
 export CFLAGS="-Wno-error $RPM_OPT_FLAGS"
-%configure --disable-static --datadir=%{_datadir}/%{__shrlibname}
+%configure --disable-static
 %{__make} %_smp_mflags
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# create symlinks of augeas.vim files to vim/site
-mkdir -p $RPM_BUILD_ROOT/usr/share/vim/site/ftdetect; \
-mkdir $RPM_BUILD_ROOT/usr/share/vim/site/syntax; \
-ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect/augeas.vim \
-      ${RPM_BUILD_ROOT}/usr/share/vim/site/ftdetect/augeas.vim
-ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim \
-      ${RPM_BUILD_ROOT}/usr/share/vim/site/syntax/augeas.vim
+# move vim files to the right location
+mv $RPM_BUILD_ROOT/%{_datadir}/vim/vimfiles $RPM_BUILD_ROOT/%{_datadir}/vim/site
 
 %post -n %{__shrlibname}
 /sbin/ldconfig
@@ -141,30 +136,24 @@ ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim \
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/augeas.pc
-
-%files lenses
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{__shrlibname}
-%dir %{_datadir}/%{__shrlibname}/%{name}
-%dir %{_datadir}/%{__shrlibname}/%{name}/lenses
-%dir %{_datadir}/%{__shrlibname}/%{name}/lenses/dist
-%{_datadir}/%{__shrlibname}/%{name}/lenses/dist/*.aug
+# vim support files
 %dir %{_datadir}/vim
 %dir %{_datadir}/vim/site
 %dir %{_datadir}/vim/site/ftdetect
 %{_datadir}/vim/site/ftdetect/augeas.vim
 %dir %{_datadir}/vim/site/syntax
 %{_datadir}/vim/site/syntax/augeas.vim
-%dir %{_datadir}/%{__shrlibname}/vim
-%dir %{_datadir}/%{__shrlibname}/vim/vimfiles
-%dir %{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect
-%{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect/augeas.vim
-%dir %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax
-%{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim
+
+%files lenses
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/lenses
+%dir %{_datadir}/%{name}/lenses/dist
+%{_datadir}/%{name}/lenses/dist/*.aug
 
 %files lense-tests
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{__shrlibname}/%{name}/lenses/dist/tests
-%{_datadir}/%{__shrlibname}/%{name}/lenses/dist/tests/*.aug
+%dir %{_datadir}/%{name}/lenses/dist/tests
+%{_datadir}/%{name}/lenses/dist/tests/*.aug
 
 %changelog