diff --git a/.cvsignore b/.cvsignore
index a30c48a..801e8c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-facter-1.5.2.tgz
+facter-1.5.4.tgz
diff --git a/facter-1.5.4-libperms.patch b/facter-1.5.4-libperms.patch
new file mode 100644
index 0000000..8b0847f
--- /dev/null
+++ b/facter-1.5.4-libperms.patch
@@ -0,0 +1,12 @@
+diff -up facter-1.5.4/install.rb.libperms facter-1.5.4/install.rb
+--- facter-1.5.4/install.rb.libperms	2008-09-08 23:00:03.000000000 -0400
++++ facter-1.5.4/install.rb	2009-02-28 14:15:53.000000000 -0500
+@@ -93,7 +93,7 @@ def do_libs(libs, strip = 'lib/')
+     op = File.dirname(olf)
+     File.makedirs(op, true)
+     File.chmod(0755, op)
+-    File.install(lf, olf, 0755, true)
++    File.install(lf, olf, 0644, true)
+   end
+ end
+ 
diff --git a/facter.spec b/facter.spec
index 5bcb2e1..d3fb20f 100644
--- a/facter.spec
+++ b/facter.spec
@@ -5,12 +5,14 @@
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.5.2
-Release: 2%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
+# http://github.com/reductivelabs/facter/commit/75db918c37a9fef36c829105d1f8a99ff8bcf751
+Patch0: facter-1.5.4-libperms.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
 BuildArch: noarch
@@ -30,26 +32,13 @@ operating system. Additional facts can be added through simple Ruby scripts
 
 %prep
 %setup -q
+%patch0 -p1 -b .libperms
 
 %build
-sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist
-%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-
-%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
-%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
-%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util
-%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist
-%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
+ruby install.rb --destdir=%{buildroot} --quick --no-rdoc
 
 %clean
 rm -rf %{buildroot}
@@ -64,6 +53,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 28 2009 Todd Zullinger <tmz@pobox.com> - 1.5.4-1
+- New version
+- Use upstream install script
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 3abef28..a68d85f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d257bc2755217690fca868c0fa0cc7b  facter-1.5.2.tgz
+0df92b81606f8e23bdd1f2ade597049b  facter-1.5.4.tgz