diff --git a/globus-ftp-control.spec b/globus-ftp-control.spec
index ffa2e7c..4e48fae 100644
--- a/globus-ftp-control.spec
+++ b/globus-ftp-control.spec
@@ -7,7 +7,7 @@
 Name:		globus-ftp-control
 %global _name %(tr - _ <<< %{name})
 Version:	2.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - GridFTP Client Control Library
 
 Group:		System Environment/Libraries
@@ -45,18 +45,11 @@ BuildRequires:	globus-io-devel >= 6
 BuildRequires:	globus-gssapi-gsi-devel >= 4
 BuildRequires:	globus-core >= 4
 BuildRequires:	doxygen
-%if %{?fedora}%{!?fedora:0} >= 3
-BuildRequires:	graphviz
-BuildRequires:	ghostscript
-%else
-%if %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	graphviz
 BuildRequires:	ghostscript
 %if "%{?rhel}" == "5"
 BuildRequires:	graphviz-gd
 %endif
-%endif
-%endif
 %if %{?fedora}%{!?fedora:0} >= 9
 BuildRequires:	tex(latex)
 %else
@@ -156,15 +149,15 @@ export PATH=$PWD/bin:$PATH
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
 # Remove libtool archives (.la files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -175,7 +168,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 sed s!doc/%{_name}!doc/%{name}-%{version}! \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Fix doxygen glitches
 for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_control_client.c.3 \
@@ -183,23 +176,21 @@ for f in $RPM_BUILD_ROOT%{_mandir}/man3/globus_ftp_control_client.c.3 \
   sed 's/P\.RS/P\n.RS/' -i $f
 done
 
-# Remove unwanted documentation
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
+# Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-sed -e '/deprecated\.3/d' \
-    -e '/_%{_name}-%{version}_.*\.3/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/_%{_name}-%{version}_.*\.3/d' \
+  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 # Generate package filelists
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
 %clean
@@ -224,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.10-2
+- Update to official Fedora Globus packaging guidelines
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.10-1
 - Make comment about source retrieval more explicit
 - Change defines to globals
@@ -236,7 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Feb 26 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.10-0.4
 - Add s390x to the list of 64 bit platforms
 
-* Thu Jan  1 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.10-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.10-0.3
 - Adapt to updated GPT package
 
 * Mon Oct 20 2008 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.10-0.2
diff --git a/import.log b/import.log
index 6d49f8c..acdc48e 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 globus-ftp-control-2_10-1_fc9:EL-5:globus-ftp-control-2.10-1.fc9.src.rpm:1243833566
+globus-ftp-control-2_10-2_fc9:EL-5:globus-ftp-control-2.10-2.fc9.src.rpm:1245093594