diff --git a/.gitignore b/.gitignore
index 70a5129..1fbbdfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /puppet-*/
 /.build*.log
 /start-puppet-wrapper
+/23115-convert-nil-to-undef.patch
diff --git a/puppet.spec b/puppet.spec
index eb53844..6f5ecf1 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -22,7 +22,7 @@
 
 Name:           puppet
 Version:        3.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -84,6 +84,10 @@ Requires(postun): initscripts
 
 Requires: tar
 
+# http://projects.puppetlabs.com/issues/23115
+# https://bugzilla.redhat.com/show_bug.cgi?id=1028930
+Patch0: 23115-convert-nil-to-undef.patch
+
 %description
 Puppet lets you centrally manage every important aspect of your system using a
 cross-platform specification language that manages all the separate elements
@@ -111,6 +115,7 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Fix some rpmlint complaints
 for f in mac_automount.pp  mcx_dock_absent.pp  mcx_dock_default.pp \
@@ -376,6 +381,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Sat Nov 16 2013 Sam Kottler <skottler@fedoraproject.org> - 3.3.1-3
+- Add patch to convert nil resource parameter values to undef (BZ#1028930)
+
 * Fri Nov 1 2013 Lukas Zapletal <lzap+rpm[@]redhat.com> - 3.3.1-2
 - Added SELinux wrappers for daemon processes
 
diff --git a/sources b/sources
index 40d639c..765e0ac 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
+0a83c5398abfd1f5cb8f6f538dae3739  start-puppet-wrapper
 e553c381df75b24c8eda00ecc6dcef8a  puppet-3.3.1.tar.gz
 db515b3dc952ad3e1b2acacfb6578cf3  puppet-3.3.1.tar.gz.asc
-0a83c5398abfd1f5cb8f6f538dae3739  start-puppet-wrapper
+6e5d1e2f9dcb5cba5efa92cb018c25ac  23115-convert-nil-to-undef.patch