diff --git a/flute.spec b/flute.spec
index 4abc432..67b878f 100644
--- a/flute.spec
+++ b/flute.spec
@@ -1,5 +1,5 @@
 # Use rpmbuild --without gcj to disable native bits
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name: flute
 Version: 1.3.0
@@ -58,12 +58,28 @@ cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{with_gcj}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{with_gcj}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc COPYRIGHT.html
 %{_javadir}/*.jar
 %if %{with_gcj}
-%attr(-,root,root,-) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %files javadoc
@@ -73,7 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Jul 08 2010 Caolán McNamara <caolanm@redhat.com> - 1.3.0-5.OOo31
-- add COPYRIGHT to all subpackages
+- add COPYRIGHT to all subpackages, sync with GCJGuidelines packaging
+  guidelines
 
 * Sun Jun 13 2010 Caolán McNamara <caolanm@redhat.com> - 1.3.0-4.OOo31
 - rpmlint warnings