diff --git a/.gitignore b/.gitignore
index 34f3440..4c71f37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /pkgconf-1.5.1.tar.xz
 /pkgconf-1.5.3.tar.xz
 /pkgconf-1.5.4.tar.xz
+/pkgconf-1.6.0.tar.xz
diff --git a/pkgconf.spec b/pkgconf.spec
index d4e92bb..b81b724 100644
--- a/pkgconf.spec
+++ b/pkgconf.spec
@@ -16,12 +16,13 @@
 %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
 
 Name:           pkgconf
-Version:        1.5.4
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Package compiler and linker metadata toolkit
 
 License:        ISC
 URL:            http://pkgconf.org/
+# Mirror at https://releases.pagure.org/pkgconf/pkgconf/
 Source0:        https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz
 
 # Simple wrapper script to offer platform versions of pkgconfig
@@ -123,6 +124,16 @@ make check
 
 find %{buildroot} -name '*.la' -print -delete
 
+mkdir -p %{buildroot}%{_sysconfdir}/pkgconfig/personality.d
+mkdir -p %{buildroot}%{_datadir}/pkgconfig/personality.d
+
+# pkgconf rpm macros
+mkdir -p %{buildroot}%{_rpmmacrodir}/
+
+cat > %{buildroot}%{_rpmmacrodir}/macros.pkgconf <<EOM
+%%pkgconfig_personalitydir %{_datadir}/pkgconfig/personality.d
+EOM
+
 %if %{with pkgconfig_compat}
 install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
 
@@ -134,8 +145,8 @@ sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \
 
 ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
 
-# I don't have a better way to deal with this...
-cp -a %{buildroot}%{_mandir}/man1/pkgconf.1 %{buildroot}%{_mandir}/man1/pkg-config.1
+# Link pkg-config(1) to pkgconf(1)
+echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
 mkdir -p %{buildroot}%{_datadir}/pkgconfig
@@ -156,6 +167,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/pc.5*
 %{_mandir}/man5/%{name}-personality.5*
+%{_rpmmacrodir}/macros.pkgconf
+%dir %{_sysconfdir}/pkgconfig
+%dir %{_sysconfdir}/pkgconfig/personality.d
+%dir %{_datadir}/pkgconfig/personality.d
 
 %files -n lib%{name}
 %license COPYING
@@ -180,6 +195,11 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 %endif
 
 %changelog
+* Sat Feb 09 2019 Neal Gompa <ngompa13@gmail.com> - 1.6.0-1
+- Update to 1.6.0
+- Add personality.d directories for cross-targets
+- Add pkgconf rpm macros for pkgconf directories
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 1c390d2..01586af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pkgconf-1.5.4.tar.xz) = 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
+SHA512 (pkgconf-1.6.0.tar.xz) = eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda